diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index 72ded1fd0841a88f280b537980a4f0172eebe6ef..3a8030af8a7ed0c4a9f2284197ab5e64c20f247a 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -1,6 +1,6 @@
>>>
-/* Database connection
- The only time paramaters are needed is to connect, otherwise the variables
- are not required "around" the application. ie Connected and done.
- Prefered is an array as $DB in capitals, ie
- $DB['engine'] = 'type';
- $DB['host'] = 'ip';
- $DB['user'] = 'me';
- $DB['password'] = 'secret';
- $DB['database'] = 'db_name';
-
- The connection paramaters are all contained within one array structure
- With this array structure the connection can be passed around, to functions
- However it can also leak so it can be destroyed eg
- $dbClass->connect($DB);
- unset($DB); // only the paranoid survive
-
- Also there is a scenario where we are devloping and using this file
- and the database paramaters might leak into svn etc.
- (This idea is borrowed from the tikiwiki.org project)
- To resolve this there is a file called db_local.php.skel which is not detected
- rename this to db_local.php and edit the paramaters.
+
+/*
+ Server variables
*/
-//* Detect the local database settings ie $DB array()
-//* Copy db_local.php.skel for and change for local development
-if(file_exists(dirname(__FILE__).'/db_local.php')){
- require_once(dirname(__FILE__).'/db_local.php');
- $conf['db_type'] = $DB['type'];
- $conf['db_host'] = $DB['host'];
- $conf['db_user'] = $DB['user'];
- $conf['db_password'] = $DB['password'];
- $conf['db_database'] = $DB['database'];
-}else{
- //** Database Settings
- $conf['db_type'] = 'mysql';
- $conf['db_host'] = 'localhost';
- $conf['db_user'] = 'root';
- $conf['db_password'] = '';
- $conf['db_database'] = 'ispconfig3';
-}
+$conf["server_id"] = "{server_id}";
+
-//** Database Settings
-/* See above
-$conf['db_type'] = 'mysql';
-$conf['db_host'] = 'localhost';
-$conf['db_user'] = 'root';
-$conf['db_password'] = '';
-$conf['db_database'] = 'ispconfig3';
+/*
+ Database Settings
*/
+$conf["db_type"] = 'mysql';
+$conf["db_host"] = 'localhost';
+$conf["db_database"] = 'dbispconfig';
+$conf["db_user"] = 'ispconfig';
+$conf["db_password"] = 'e8605b27a4360d135f62129627d8d9ad';
-//** External programs
-//$conf["programs"]["convert"] = "/usr/bin/convert";
-$conf['programs']['wput'] = ISPC_ROOT_PATH."\\tools\\wput\\wput.exe";
+/*
+ Path Settings (Do not change!)
+*/
+
+$conf["rootpath"] = substr(dirname(__FILE__),0,-4);
+$conf["fs_div"] = "/"; // File system divider, \\ on windows and / on linux and unix
+$conf["classpath"] = $conf["rootpath"].$conf["fs_div"]."lib".$conf["fs_div"]."classes";
+$conf["temppath"] = $conf["rootpath"].$conf["fs_div"]."temp";
-//** Themes
-$conf['theme'] = 'default';
-$conf['html_content_encoding'] = 'text/html; charset=utf-8';
+define("DIR_TRENNER",$conf["fs_div"]);
+define("SERVER_ROOT",$conf["rootpath"]);
+define("INCLUDE_ROOT",SERVER_ROOT.DIR_TRENNER."lib");
+define("CLASSES_ROOT",INCLUDE_ROOT.DIR_TRENNER."classes");
-//** Default Language
-$conf['language'] = 'en';
+define("DB_TYPE",$conf["db_type"]);
+define("DB_HOST",$conf["db_host"]);
+define("DB_DATABASE",$conf["db_database"]);
+define("DB_USER",$conf["db_user"]);
+define("DB_PASSWORD",$conf["db_password"]);
+
+/*
+ Logging
+*/
-//** Auto Load Modules
-$conf['start_db'] = true;
-$conf['start_session'] = true;
+$conf["log_file"] = '/var/log/ispconfig/ispconfig.log';
+$conf["log_priority"] = 2; // 0 = Debug, 1 = Warning, 2 = Error
+
+/*
+ Allow software package installations
+*/
+
+$conf['software_updates_enabled'] = false;
+
+
+/*
+ Themes
+*/
+
+$conf["theme"] = 'default';
+$conf["html_content_encoding"] = 'text/html; charset=iso-8859-1';
+$conf["logo"] = 'themes/default/images/mydnsconfig_logo.gif';
+
+/*
+ Default Language
+*/
+
+$conf["language"] = 'en';
/*
Misc.
@@ -131,18 +137,19 @@ $conf['start_session'] = true;
$conf["interface_logout_url"] = ""; // example: http://www.domain.tld/
-//** DNS Settings
+/*
+ Auto Load Modules
+*/
+
+$conf["start_db"] = true;
+$conf["start_session"] = true;
+
+/*
+ Constants
+*/
-//* Automatically create PTR records?
-$conf['auto_create_ptr'] = 1;
-//* must be set if $conf['auto_create_ptr'] is 1. Don't forget the trailing dot!
-$conf['default_ns'] = 'ns1.example.com.';
-//* Admin email address. Must be set if $conf['auto_create_ptr'] is 1. Replace "@" with ".". Don't forget the trailing dot!
-$conf['default_mbox'] = 'admin.example.com.';
-$conf['default_ttl'] = 86400;
-$conf['default_refresh'] = 28800;
-$conf['default_retry'] = 7200;
-$conf['default_expire'] = 604800;
-$conf['default_minimum_ttl'] = 86400;
+define("LOGLEVEL_DEBUG",0);
+define("LOGLEVEL_WARN",1);
+define("LOGLEVEL_ERROR",2);
?>
\ No newline at end of file
diff --git a/interface/lib/lang/de.lng b/interface/lib/lang/de.lng
index d07898a8758e69993da06b6298d9ae20aad9cc9b..3c5035c6e1d8830d758e16787972523ce42273f9 100644
--- a/interface/lib/lang/de.lng
+++ b/interface/lib/lang/de.lng
@@ -1,8 +1,6 @@
-
diff --git a/interface/web/admin/lib/lang/de_filesync_list.lng b/interface/web/admin/lib/lang/de_filesync_list.lng
index eae42884c837c9ad7cb3af085c2a8f3a8e8973c7..2c8145854ff7949425665917c6726f28c3a92bda 100644
--- a/interface/web/admin/lib/lang/de_filesync_list.lng
+++ b/interface/web/admin/lib/lang/de_filesync_list.lng
@@ -3,10 +3,4 @@ $wb['list_head_txt'] = 'Datei Synchronisation';
$wb['jobname_txt'] = 'Name';
$wb['ftp_host_txt'] = 'FTP Server';
$wb['local_path_txt'] = 'lokaler Pfad';
-$wb['page_txt'] = 'Page';
-$wb['page_of_txt'] = 'of';
-$wb['page_next_txt'] = 'Next';
-$wb['page_back_txt'] = 'Back';
-$wb['delete_txt'] = 'Delete';
-$wb['filter_txt'] = 'Filter';
?>
diff --git a/interface/web/admin/lib/lang/de_users.lng b/interface/web/admin/lib/lang/de_users.lng
index 3655dda4c4de22d0e49c166db3912a6889706d76..6851e5d989819b64008447de43fcf052b193a874 100644
--- a/interface/web/admin/lib/lang/de_users.lng
+++ b/interface/web/admin/lib/lang/de_users.lng
@@ -26,4 +26,5 @@ $wb['username_unique'] = 'There is already a user with this username.';
$wb['btn_save_txt'] = 'Save';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['startmodule_err'] = 'Start module is not within modules.';
+$wb['password_strength_txt'] = 'Password strength';
?>
diff --git a/interface/web/admin/lib/lang/en_users.lng b/interface/web/admin/lib/lang/en_users.lng
index e0ffa6135ca657fb439b72bf0230100d0229a2ed..c93f4c765846482f351e5fedc5b299985fed309c 100644
--- a/interface/web/admin/lib/lang/en_users.lng
+++ b/interface/web/admin/lib/lang/en_users.lng
@@ -4,6 +4,7 @@ $wb["username_err"] = 'The username is too long or contains invalid characters.'
$wb["username_empty"] = 'The username is empty.';
$wb["username_unique"] = 'There is already a user with this username.';
$wb["passwort_txt"] = 'Password';
+$wb["password_strength_txt"] = 'Password strength';
$wb["modules_txt"] = 'Module';
$wb["startmodule_txt"] = 'Startmodule';
$wb["app_theme_txt"] = 'Design';
@@ -27,4 +28,4 @@ $wb["active_txt"] = 'Active';
$wb["btn_save_txt"] = 'Save';
$wb["btn_cancel_txt"] = 'Cancel';
$wb["startmodule_err"] = 'Start module is not within modules.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/admin/lib/lang/ru.lng b/interface/web/admin/lib/lang/ru.lng
index fb7b4badd71786abc391e94760804241d3cd903c..f68a1d32088c47b2efacda51e239f994a9b9a294 100644
--- a/interface/web/admin/lib/lang/ru.lng
+++ b/interface/web/admin/lib/lang/ru.lng
@@ -1,6 +1,34 @@
diff --git a/interface/web/admin/lib/lang/ru_dbsync.lng b/interface/web/admin/lib/lang/ru_dbsync.lng
index bdbabb5d6afaa7560228e9edd53181a860ebb6cc..318bcbaa68ea90754f777b9f5ff43b325720ff1f 100644
--- a/interface/web/admin/lib/lang/ru_dbsync.lng
+++ b/interface/web/admin/lib/lang/ru_dbsync.lng
@@ -1,16 +1,16 @@
diff --git a/interface/web/admin/lib/lang/ru_dbsync_list.lng b/interface/web/admin/lib/lang/ru_dbsync_list.lng
index 6fe335ea8f68728ddd8f8b1be97c27a4f807cd63..0bc7d10112da092025cbd180a925185fec6f1e3b 100644
--- a/interface/web/admin/lib/lang/ru_dbsync_list.lng
+++ b/interface/web/admin/lib/lang/ru_dbsync_list.lng
@@ -1,14 +1,13 @@
diff --git a/interface/web/admin/lib/lang/ru_filesync.lng b/interface/web/admin/lib/lang/ru_filesync.lng
index a04b77630d63af93574444565f1ef6af66b16fd3..f2261932deab466ad658dbbb49a9b5b8039074c5 100644
--- a/interface/web/admin/lib/lang/ru_filesync.lng
+++ b/interface/web/admin/lib/lang/ru_filesync.lng
@@ -1,12 +1,12 @@
diff --git a/interface/web/admin/lib/lang/ru_filesync_list.lng b/interface/web/admin/lib/lang/ru_filesync_list.lng
index 2c29224388f98013c6f0ed9f50bc48e1d6dc558e..ce7080b934f1563209a6c1e4277345d55060388d 100644
--- a/interface/web/admin/lib/lang/ru_filesync_list.lng
+++ b/interface/web/admin/lib/lang/ru_filesync_list.lng
@@ -1,6 +1,6 @@
diff --git a/interface/web/admin/lib/lang/ru_firewall.lng b/interface/web/admin/lib/lang/ru_firewall.lng
index b8d5221e8fb32409c1e0aa9e07a2a4a4d4e5d97e..ded71717e8426f6aba38a005eceb0be334fa37e8 100644
--- a/interface/web/admin/lib/lang/ru_firewall.lng
+++ b/interface/web/admin/lib/lang/ru_firewall.lng
@@ -1,11 +1,11 @@
diff --git a/interface/web/admin/lib/lang/ru_firewall_list.lng b/interface/web/admin/lib/lang/ru_firewall_list.lng
index 8da20ce5fbd4bcdea2d5bac2f076f5c7d3c657df..866596b6068e05a8b33e276b662a68a09c42722d 100644
--- a/interface/web/admin/lib/lang/ru_firewall_list.lng
+++ b/interface/web/admin/lib/lang/ru_firewall_list.lng
@@ -1,14 +1,14 @@
diff --git a/interface/web/admin/lib/lang/ru_groups.lng b/interface/web/admin/lib/lang/ru_groups.lng
index 513f0afeea6ed04d4b607f640660e80452ebfbcd..380ea1cef30840bff511571178cb2cd8b8ba18a3 100644
--- a/interface/web/admin/lib/lang/ru_groups.lng
+++ b/interface/web/admin/lib/lang/ru_groups.lng
@@ -1,7 +1,7 @@
diff --git a/interface/web/admin/lib/lang/ru_groups_list.lng b/interface/web/admin/lib/lang/ru_groups_list.lng
index 4db46a1d1e7682d4ddac9edf309d7ed9fdad6a80..828d4884db7db11f5a4abbd157ef81379f906c8a 100644
--- a/interface/web/admin/lib/lang/ru_groups_list.lng
+++ b/interface/web/admin/lib/lang/ru_groups_list.lng
@@ -1,12 +1,12 @@
diff --git a/interface/web/admin/lib/lang/ru_language_add.lng b/interface/web/admin/lib/lang/ru_language_add.lng
index 949acb66fefc67e9659c048e0f5208384d948926..82aedcb41d64756b5a2728bd81f7ed329d1249e1 100644
--- a/interface/web/admin/lib/lang/ru_language_add.lng
+++ b/interface/web/admin/lib/lang/ru_language_add.lng
@@ -1,7 +1,7 @@
diff --git a/interface/web/admin/lib/lang/ru_language_edit.lng b/interface/web/admin/lib/lang/ru_language_edit.lng
index b5cbb166940688981d87c88a0f7671e8dc06e539..3a92ac2d28e4f4681f5a8a24acc3bd99c699c0f3 100644
--- a/interface/web/admin/lib/lang/ru_language_edit.lng
+++ b/interface/web/admin/lib/lang/ru_language_edit.lng
@@ -6,4 +6,3 @@ $wb['lang_file_txt'] = 'Выбрать язык';
$wb['btn_save_txt'] = 'Сохранить';
$wb['btn_cancel_txt'] = 'Назад';
?>
-
diff --git a/interface/web/admin/lib/lang/ru_language_export.lng b/interface/web/admin/lib/lang/ru_language_export.lng
index c8861c9a956fb270c6fc9e2c1520cb9e830b35a8..29a95223279b22082cace3bb4960e382509b22a3 100644
--- a/interface/web/admin/lib/lang/ru_language_export.lng
+++ b/interface/web/admin/lib/lang/ru_language_export.lng
@@ -1,6 +1,6 @@
diff --git a/interface/web/admin/lib/lang/ru_language_import.lng b/interface/web/admin/lib/lang/ru_language_import.lng
index 43f6418fc7def0d65ee1ea9659e25c0d38f2fb20..10dbc0497f4cdd807d1257728203eaaf2d25928b 100644
--- a/interface/web/admin/lib/lang/ru_language_import.lng
+++ b/interface/web/admin/lib/lang/ru_language_import.lng
@@ -1,7 +1,7 @@
diff --git a/interface/web/admin/lib/lang/ru_language_list.lng b/interface/web/admin/lib/lang/ru_language_list.lng
index ea73366e0eaf52cca46df2db4352cb485238f0d9..b502fd8ed9f978a7a68aa3fdb5bc0174d53cf0d5 100644
--- a/interface/web/admin/lib/lang/ru_language_list.lng
+++ b/interface/web/admin/lib/lang/ru_language_list.lng
@@ -1,6 +1,6 @@
diff --git a/interface/web/admin/lib/lang/ru_server.lng b/interface/web/admin/lib/lang/ru_server.lng
index b111e425702f4b88219b75c8bdb22835feb11f8e..79857c2f522d0829babde3ec90fbc4cea4efcf6a 100644
--- a/interface/web/admin/lib/lang/ru_server.lng
+++ b/interface/web/admin/lib/lang/ru_server.lng
@@ -1,13 +1,13 @@
diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng
index 8695b82d555f87186e01e184cbf18dd7b579e77b..e689a6456e9912fa4f558c4ca60467453cbc1707 100644
--- a/interface/web/admin/lib/lang/ru_server_config.lng
+++ b/interface/web/admin/lib/lang/ru_server_config.lng
@@ -1,36 +1,37 @@
diff --git a/interface/web/admin/lib/lang/ru_server_config_list.lng b/interface/web/admin/lib/lang/ru_server_config_list.lng
index 4f40b611784a777a5f46cd113f1aeb5a64674b16..6a1f6cc370b34b535816f5a8d4790f1cd23809a6 100644
--- a/interface/web/admin/lib/lang/ru_server_config_list.lng
+++ b/interface/web/admin/lib/lang/ru_server_config_list.lng
@@ -1,10 +1,10 @@
diff --git a/interface/web/admin/lib/lang/ru_server_ip.lng b/interface/web/admin/lib/lang/ru_server_ip.lng
index eab51c9b046cf7551001c7e2417c85fe1ed19ad2..ac5dc4213615fa894d89219c694d87fca9bc69a5 100644
--- a/interface/web/admin/lib/lang/ru_server_ip.lng
+++ b/interface/web/admin/lib/lang/ru_server_ip.lng
@@ -1,8 +1,8 @@
diff --git a/interface/web/admin/lib/lang/ru_server_ip_list.lng b/interface/web/admin/lib/lang/ru_server_ip_list.lng
index b6c6d31b303af1230510507a416fab28302ce212..d6ac978d11a4a8d662133b9242638f765f86a287 100644
--- a/interface/web/admin/lib/lang/ru_server_ip_list.lng
+++ b/interface/web/admin/lib/lang/ru_server_ip_list.lng
@@ -1,12 +1,12 @@
diff --git a/interface/web/admin/lib/lang/ru_server_list.lng b/interface/web/admin/lib/lang/ru_server_list.lng
index 921508a2ba5b62ce890d35ca74e6bebd2b262081..ea8e0bf64d46ed75423aac7df0ef2964f44a6f88 100644
--- a/interface/web/admin/lib/lang/ru_server_list.lng
+++ b/interface/web/admin/lib/lang/ru_server_list.lng
@@ -1,17 +1,17 @@
diff --git a/interface/web/admin/lib/lang/ru_users.lng b/interface/web/admin/lib/lang/ru_users.lng
index 46e0de117446457f8e77af96ea3f08b4334fbcfa..99bd8cf1ec3c336c5e24d0fb342f8e3905189702 100644
--- a/interface/web/admin/lib/lang/ru_users.lng
+++ b/interface/web/admin/lib/lang/ru_users.lng
@@ -1,27 +1,30 @@
diff --git a/interface/web/admin/lib/lang/ru_users_list.lng b/interface/web/admin/lib/lang/ru_users_list.lng
index 353340d960c68a885c4b81706e35699075173df2..4a7151d8db906c72c9eb04a0bf9b0070468b27cf 100644
--- a/interface/web/admin/lib/lang/ru_users_list.lng
+++ b/interface/web/admin/lib/lang/ru_users_list.lng
@@ -1,15 +1,14 @@
diff --git a/interface/web/admin/templates/users_user_edit.htm b/interface/web/admin/templates/users_user_edit.htm
index b02af601d8af555cd645c1a066e8d696e6e91759..c497f441a6bc79ebff23e176f7ad34f4376aef2c 100644
--- a/interface/web/admin/templates/users_user_edit.htm
+++ b/interface/web/admin/templates/users_user_edit.htm
@@ -10,9 +10,14 @@
-
+
+
+
+
+
+
{tmpl_var name='modules_txt'}
diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng
index 8176707ce91eedd4250826fce1a51b7cc638bbef..ee75e5563cce72795252df692c39993e7c0980a9 100644
--- a/interface/web/client/lib/lang/de_client.lng
+++ b/interface/web/client/lib/lang/de_client.lng
@@ -77,4 +77,5 @@ $wb['limit_dns_zone_error_notint'] = 'The dns record limit must be a number.';
$wb['default_dbserver_txt'] = 'Default Database Server';
$wb['limit_database_error_notint'] = 'The database limit must be a number.';
$wb['username_error_regex'] = 'The Username contains invalid chracaters.';
+$wb['password_strength_txt'] = 'Password strength';
?>
diff --git a/interface/web/client/lib/lang/de_clients_list.lng b/interface/web/client/lib/lang/de_clients_list.lng
index b4e04e7483efbb0f0e863be62b6b0e8c9cc42f5a..776312a44e966d99750d63657bb029f8811b1375 100644
--- a/interface/web/client/lib/lang/de_clients_list.lng
+++ b/interface/web/client/lib/lang/de_clients_list.lng
@@ -1,6 +1,6 @@
\ No newline at end of file
+?>
diff --git a/interface/web/client/lib/lang/it_client.lng b/interface/web/client/lib/lang/it_client.lng
index 3547789fb0114a186f5d9864eee02b83e0d0f244..505f2f1e16fd47902cc88dd245d2a04875aad70f 100644
--- a/interface/web/client/lib/lang/it_client.lng
+++ b/interface/web/client/lib/lang/it_client.lng
@@ -77,4 +77,5 @@ $wb['limit_dns_zone_error_notint'] = 'Il limite dei record dns deve essere un nu
$wb['default_dbserver_txt'] = 'Server Database predefinito';
$wb['limit_database_error_notint'] = 'Il limite dei database deve essere un numero.';
$wb['username_error_regex'] = 'Il nome utente contiene caratteri non validi.';
+$wb['password_strength_txt'] = 'Password strength';
?>
diff --git a/interface/web/client/templates/client_edit_address.htm b/interface/web/client/templates/client_edit_address.htm
index 0bc2cb77988ef330b1325fdd145a8e98dd6ec744..e8c1194c7e65f2777f22e56a24d0368ea3b69b9e 100644
--- a/interface/web/client/templates/client_edit_address.htm
+++ b/interface/web/client/templates/client_edit_address.htm
@@ -18,7 +18,12 @@
- *
+ *
+
+
+
+
+
diff --git a/interface/web/designer/lib/lang/ru.lng b/interface/web/designer/lib/lang/ru.lng
index 62a2de0c86e67cd85333eb6effb08b9f6eea76f6..acb6c3546c6150b4edbafb782d3ed85c499210b5 100644
--- a/interface/web/designer/lib/lang/ru.lng
+++ b/interface/web/designer/lib/lang/ru.lng
@@ -1,3 +1,2 @@
diff --git a/interface/web/designer/lib/lang/ru_form_edit.lng b/interface/web/designer/lib/lang/ru_form_edit.lng
index 08e3b643f0fd4b89880ab95e6bc70cb3588bac70..84c58a21f72b6b48cd78e6b135fae94b8b8d96ed 100644
--- a/interface/web/designer/lib/lang/ru_form_edit.lng
+++ b/interface/web/designer/lib/lang/ru_form_edit.lng
@@ -1,26 +1,24 @@
diff --git a/interface/web/designer/lib/lang/ru_form_list.lng b/interface/web/designer/lib/lang/ru_form_list.lng
index 6f9678f1397a06383d7a81f0324348dc5be8051d..e35e5934217130175dffe19a78305c0ded19b028 100644
--- a/interface/web/designer/lib/lang/ru_form_list.lng
+++ b/interface/web/designer/lib/lang/ru_form_list.lng
@@ -1,7 +1,7 @@
diff --git a/interface/web/designer/lib/lang/ru_form_show.lng b/interface/web/designer/lib/lang/ru_form_show.lng
index 6672a4024522c93bab339d2be0676d591a29adc1..bf5e22e25f0461488bb0d590b18848941a5de0ee 100644
--- a/interface/web/designer/lib/lang/ru_form_show.lng
+++ b/interface/web/designer/lib/lang/ru_form_show.lng
@@ -1,19 +1,18 @@
diff --git a/interface/web/designer/lib/lang/ru_module_edit.lng b/interface/web/designer/lib/lang/ru_module_edit.lng
index f959b75187ecaa276f6839702fd3552cadddad6c..831ed35beb6b5fd34a1474a7e4013f2eb9898e32 100644
--- a/interface/web/designer/lib/lang/ru_module_edit.lng
+++ b/interface/web/designer/lib/lang/ru_module_edit.lng
@@ -1,14 +1,14 @@
Description
Модульname: Name of the module directory. Only numbers, chars and underscore allowed.
@@ -17,7 +17,6 @@ $wb["description_txt"] = '
NaviFrame: If module_tree.tpl.htm selected as template file, enter here the path to the script file for the left frame.
Default page: These page will be shown when the module is opened.
Tab width: Width of the Tabs in the main navigation. The field is empty by default. You can enter values absolute in pixel (e.g 20) or relative (e.g 20%).
-Hint: All paths are relative to the directory "web".
+Hint: All paths are relative to the directory web.
';
-
?>
diff --git a/interface/web/designer/lib/lang/ru_module_list.lng b/interface/web/designer/lib/lang/ru_module_list.lng
index fc7ac522451c419ef95ba643faf79e61a96b0655..2401318dd5657bfe955e54801bcf7406573313ca 100644
--- a/interface/web/designer/lib/lang/ru_module_list.lng
+++ b/interface/web/designer/lib/lang/ru_module_list.lng
@@ -1,5 +1,5 @@
diff --git a/interface/web/designer/lib/lang/ru_module_nav_item_edit.lng b/interface/web/designer/lib/lang/ru_module_nav_item_edit.lng
index c96861d62694ae2e549f6f2f813f67f5d4076f0c..b1a7dafc329022e4c225fff85c1b074237d14bf6 100644
--- a/interface/web/designer/lib/lang/ru_module_nav_item_edit.lng
+++ b/interface/web/designer/lib/lang/ru_module_nav_item_edit.lng
@@ -1,8 +1,8 @@
diff --git a/interface/web/designer/lib/lang/ru_module_show.lng b/interface/web/designer/lib/lang/ru_module_show.lng
index 5e723729664220af94bf6049106783cdbebf0682..bf1371fcd1f23715367b6a268e726f9bd1cc4aaa 100644
--- a/interface/web/designer/lib/lang/ru_module_show.lng
+++ b/interface/web/designer/lib/lang/ru_module_show.lng
@@ -1,17 +1,16 @@
diff --git a/interface/web/dns/lib/lang/ru_dns_a.lng b/interface/web/dns/lib/lang/ru_dns_a.lng
index bbd66b3ce8fcb1090df6059b2d8737ca9fb41a63..ec57188d0d93857d9365b7d54932bf3cede5090c 100644
--- a/interface/web/dns/lib/lang/ru_dns_a.lng
+++ b/interface/web/dns/lib/lang/ru_dns_a.lng
@@ -1,17 +1,17 @@
diff --git a/interface/web/dns/lib/lang/ru_dns_a_list.lng b/interface/web/dns/lib/lang/ru_dns_a_list.lng
index 3d0346995f6432d9a55d7c4aeb9d7348dd96f327..dcd4c5e64f56e7be093b30cc2618972b06fdc9b8 100644
--- a/interface/web/dns/lib/lang/ru_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/ru_dns_a_list.lng
@@ -1,16 +1,17 @@
diff --git a/interface/web/dns/lib/lang/ru_dns_alias.lng b/interface/web/dns/lib/lang/ru_dns_alias.lng
index 39cbb742a1d8a97c4777d22b5a9cad37c9a68312..391a5ae87ae9e405e800bef789c51f28a21a29f3 100644
--- a/interface/web/dns/lib/lang/ru_dns_alias.lng
+++ b/interface/web/dns/lib/lang/ru_dns_alias.lng
@@ -1,17 +1,17 @@
diff --git a/interface/web/dns/lib/lang/ru_dns_cname.lng b/interface/web/dns/lib/lang/ru_dns_cname.lng
index 4b66ca025e58da36c77324ca89c34c93e46202e7..047c807185ccb78fcf08f5276ec89f8fab78dfa0 100644
--- a/interface/web/dns/lib/lang/ru_dns_cname.lng
+++ b/interface/web/dns/lib/lang/ru_dns_cname.lng
@@ -1,17 +1,17 @@
diff --git a/interface/web/dns/lib/lang/ru_dns_hinfo.lng b/interface/web/dns/lib/lang/ru_dns_hinfo.lng
index e42215abd64bf2e3a7b4210420dd0f7f75eb782e..af1e84ff11923a0bdc313a0a2b8cd0215b59216a 100644
--- a/interface/web/dns/lib/lang/ru_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/ru_dns_hinfo.lng
@@ -1,17 +1,17 @@
diff --git a/interface/web/dns/lib/lang/ru_dns_mx.lng b/interface/web/dns/lib/lang/ru_dns_mx.lng
index 41b34fda7371d50672f57cf54dde5960a37ca38b..90eeb212b0e59b2607d1f778b51ae6113c1ee5cc 100644
--- a/interface/web/dns/lib/lang/ru_dns_mx.lng
+++ b/interface/web/dns/lib/lang/ru_dns_mx.lng
@@ -1,18 +1,18 @@
diff --git a/interface/web/dns/lib/lang/ru_dns_ns.lng b/interface/web/dns/lib/lang/ru_dns_ns.lng
index 8cf3f4ca875e7f1e7d7bc682e81aa164f41ce156..d9661d17cedd8a2f9e4d2432c9276cf9ce94f5af 100644
--- a/interface/web/dns/lib/lang/ru_dns_ns.lng
+++ b/interface/web/dns/lib/lang/ru_dns_ns.lng
@@ -1,17 +1,17 @@
diff --git a/interface/web/dns/lib/lang/ru_dns_ptr.lng b/interface/web/dns/lib/lang/ru_dns_ptr.lng
index 75fe9d62cb9ce8be744565d6db933339954fbce5..05008b70758bc234a1b17dae44c0a6472a4c4c6c 100644
--- a/interface/web/dns/lib/lang/ru_dns_ptr.lng
+++ b/interface/web/dns/lib/lang/ru_dns_ptr.lng
@@ -1,17 +1,17 @@
diff --git a/interface/web/dns/lib/lang/ru_dns_rp.lng b/interface/web/dns/lib/lang/ru_dns_rp.lng
index abdcd5c737386bcd530ab78cb1185c4658e09bed..e165b3cde4b69bfad1c1b4c91157bc6b425e8085 100644
--- a/interface/web/dns/lib/lang/ru_dns_rp.lng
+++ b/interface/web/dns/lib/lang/ru_dns_rp.lng
@@ -1,17 +1,17 @@
diff --git a/interface/web/dns/lib/lang/ru_dns_soa.lng b/interface/web/dns/lib/lang/ru_dns_soa.lng
index 23f42a479cb56423429fdfb1d98b01132631ace3..015a247cfd3c2a2c6293334d1e3b6f691d603ee6 100644
--- a/interface/web/dns/lib/lang/ru_dns_soa.lng
+++ b/interface/web/dns/lib/lang/ru_dns_soa.lng
@@ -1,26 +1,26 @@
diff --git a/interface/web/dns/lib/lang/ru_dns_soa_list.lng b/interface/web/dns/lib/lang/ru_dns_soa_list.lng
index f17bd784726eff8a700d063d293b15bcbafbcaf9..2114aec44bd4e095da74a3a0f527a2a6ad286534 100644
--- a/interface/web/dns/lib/lang/ru_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/ru_dns_soa_list.lng
@@ -1,15 +1,15 @@
diff --git a/interface/web/dns/lib/lang/ru_dns_srv.lng b/interface/web/dns/lib/lang/ru_dns_srv.lng
index c7309e2d3f4c3bf7b3872d0988d9bf43d6385f68..f00e1c0b9eafe61456695699e0d52e17aa95eaae 100644
--- a/interface/web/dns/lib/lang/ru_dns_srv.lng
+++ b/interface/web/dns/lib/lang/ru_dns_srv.lng
@@ -1,17 +1,17 @@
diff --git a/interface/web/dns/lib/lang/ru_dns_txt.lng b/interface/web/dns/lib/lang/ru_dns_txt.lng
index 42215f3b4775038c8e74aa41ffcd9fe5ad3a0839..7009d184a0ad6607e4c92788378941a200eaff83 100644
--- a/interface/web/dns/lib/lang/ru_dns_txt.lng
+++ b/interface/web/dns/lib/lang/ru_dns_txt.lng
@@ -1,17 +1,17 @@
diff --git a/interface/web/help/lib/lang/ru_support_message.lng b/interface/web/help/lib/lang/ru_support_message.lng
index 174eb7143bb3a81b8815b7871717ac08b3eeba98..ef309640e0b8d624ee750a1c4dbddecc6f5e514e 100644
--- a/interface/web/help/lib/lang/ru_support_message.lng
+++ b/interface/web/help/lib/lang/ru_support_message.lng
@@ -7,4 +7,3 @@ $wb['tstamp_txt'] = 'Timestamp';
$wb['btn_save_txt'] = 'Сохранить';
$wb['btn_cancel_txt'] = 'Закончить';
?>
-
diff --git a/interface/web/help/lib/lang/ru_support_message_list.lng b/interface/web/help/lib/lang/ru_support_message_list.lng
index bc82ccd72cfcdbdb582fd907e7b9a514640b53c1..ca4c1049fc5987da2fb177564a05cb0ef2bbcb27 100644
--- a/interface/web/help/lib/lang/ru_support_message_list.lng
+++ b/interface/web/help/lib/lang/ru_support_message_list.lng
@@ -8,5 +8,5 @@ $wb['page_next_txt'] = 'Дальше';
$wb['page_back_txt'] = 'Назад';
$wb['delete_txt'] = 'Удалить';
$wb['filter_txt'] = 'Фильтр';
-$wb["add_new_record_txt"] = 'Создайте новое сообщение службы поддержки';
+$wb['add_new_record_txt'] = 'Создайте новое сообщение службы поддержки';
?>
diff --git a/interface/web/js/lib/lang/de_javascript.lng b/interface/web/js/lib/lang/de_javascript.lng
new file mode 100644
index 0000000000000000000000000000000000000000..2a6de41f1eb745718c3358e775e25d083c51070b
--- /dev/null
+++ b/interface/web/js/lib/lang/de_javascript.lng
@@ -0,0 +1,8 @@
+
diff --git a/interface/web/js/lib/lang/en_javascript.lng b/interface/web/js/lib/lang/en_javascript.lng
new file mode 100644
index 0000000000000000000000000000000000000000..2a6de41f1eb745718c3358e775e25d083c51070b
--- /dev/null
+++ b/interface/web/js/lib/lang/en_javascript.lng
@@ -0,0 +1,8 @@
+
diff --git a/interface/web/js/lib/lang/fr_javascript.lng b/interface/web/js/lib/lang/fr_javascript.lng
new file mode 100644
index 0000000000000000000000000000000000000000..2a6de41f1eb745718c3358e775e25d083c51070b
--- /dev/null
+++ b/interface/web/js/lib/lang/fr_javascript.lng
@@ -0,0 +1,8 @@
+
diff --git a/interface/web/js/lib/lang/it_javascript.lng b/interface/web/js/lib/lang/it_javascript.lng
new file mode 100644
index 0000000000000000000000000000000000000000..2a6de41f1eb745718c3358e775e25d083c51070b
--- /dev/null
+++ b/interface/web/js/lib/lang/it_javascript.lng
@@ -0,0 +1,8 @@
+
diff --git a/interface/web/js/lib/lang/nl_javascript.lng b/interface/web/js/lib/lang/nl_javascript.lng
new file mode 100644
index 0000000000000000000000000000000000000000..2a6de41f1eb745718c3358e775e25d083c51070b
--- /dev/null
+++ b/interface/web/js/lib/lang/nl_javascript.lng
@@ -0,0 +1,8 @@
+
diff --git a/interface/web/js/lib/lang/ru_javascript.lng b/interface/web/js/lib/lang/ru_javascript.lng
new file mode 100644
index 0000000000000000000000000000000000000000..2a6de41f1eb745718c3358e775e25d083c51070b
--- /dev/null
+++ b/interface/web/js/lib/lang/ru_javascript.lng
@@ -0,0 +1,8 @@
+
diff --git a/interface/web/js/lib/lang/se_javascript.lng b/interface/web/js/lib/lang/se_javascript.lng
new file mode 100644
index 0000000000000000000000000000000000000000..2a6de41f1eb745718c3358e775e25d083c51070b
--- /dev/null
+++ b/interface/web/js/lib/lang/se_javascript.lng
@@ -0,0 +1,8 @@
+
diff --git a/interface/web/js/scrigo.js b/interface/web/js/scrigo.js.php
similarity index 70%
rename from interface/web/js/scrigo.js
rename to interface/web/js/scrigo.js.php
index 1b51dd0edde334c7463136f1bb3533d87f8efea8..6e6affb2041efbd72777a665eaef354f13fd9038 100644
--- a/interface/web/js/scrigo.js
+++ b/interface/web/js/scrigo.js.php
@@ -1,3 +1,9 @@
+
+
redirect = '';
function loadContentRefresh(pagename) {
@@ -277,4 +283,125 @@ function keepalive() {
var pageContentObject3 = YAHOO.util.Connect.asyncRequest('GET', 'keepalive.php', pageContentCallbackKeepalive);
//setTimeout( keepalive, 1000000 );
-}
\ No newline at end of file
+}
+
+
+
+var pass_minimum_length = 5;
+var pass_messages = new Array();
+
+var pass_message = new Array();
+pass_message['text'] = "";
+pass_message['color'] = "#d0d0d0";
+pass_messages[0] = pass_message;
+
+var pass_message = new Array();
+pass_message['text'] = "";
+pass_message['color'] = "red";
+pass_messages[1] = pass_message;
+
+var pass_message = new Array();
+pass_message['text'] = "";
+pass_message['color'] = "yellow";
+pass_messages[2] = pass_message;
+
+var pass_message = new Array();
+pass_message['text'] = "";
+pass_message['color'] = "#00ff00";
+pass_messages[3] = pass_message;
+
+var pass_message = new Array();
+pass_message['text'] = "";
+pass_message['color'] = "green";
+pass_messages[4] = pass_message;
+
+var pass_message = new Array();
+pass_message['text'] = "";
+pass_message['color'] = "green";
+pass_messages[5] = pass_message;
+
+function pass_check(password) {
+ var length = password.length;
+ var points = 0;
+ if (length < pass_minimum_length) {
+ pass_result(0);
+ return;
+ }
+
+ if (length < 5) {
+ pass_result(1);
+ return;
+ }
+
+ if (pass_contains(password, "ABCDEFGHIJKLNMOPQRSTUVWXYZ")) {
+ points += 1;
+ }
+
+ if (pass_contains(password, "0123456789")) {
+ points += 1;
+ }
+
+ if (pass_contains(password, "`~!@#$%^&*()_+|\=-[]}{';:/?.>,<\" ")) {
+ points += 1;
+ }
+
+ if (points == 0) {
+ if (length >= 5 && length <=6) {
+ pass_result(1);
+ } else if (length >= 7 && length <=8) {
+ pass_result(2);
+ } else {
+ pass_result(3);
+ }
+ } else if (points == 1) {
+ if (length >= 5 && length <=6) {
+ pass_result(2);
+ } else if (length >= 7 && length <=10) {
+ pass_result(3);
+ } else {
+ pass_result(4);
+ }
+ } else if (points == 2) {
+ if (length >= 5 && length <=8) {
+ pass_result(3);
+ } else if (length >= 9 && length <=10) {
+ pass_result(4);
+ } else {
+ pass_result(5);
+ }
+ } else if (points == 3) {
+ if (length >= 5 && length <=6) {
+ pass_result(3);
+ } else if (length >= 7 && length <=8) {
+ pass_result(4);
+ } else {
+ pass_result(5);
+ }
+ } else if (points >= 4) {
+ if (length >= 5 && length <=6) {
+ pass_result(4);
+ } else {
+ pass_result(5);
+ }
+ }
+}
+
+
+
+function pass_result(points, message) {
+ if (points == 0) {
+ width = 10;
+ } else {
+ width = points*20;
+ }
+ document.getElementById("passBar").innerHTML = '';
+ document.getElementById("passText").innerHTML = pass_messages[points]['text'];
+}
+function pass_contains(pass, check) {
+ for (i = 0; i < pass.length; i++) {
+ if (check.indexOf(pass.charAt(i)) > -1) {
+ return true;
+ }
+ }
+ return false;
+}
diff --git a/interface/web/login/lib/lang/ru.lng b/interface/web/login/lib/lang/ru.lng
index e5994adc60a5b0a5b0147725212598851b38bac5..41cd36de8333158224f8c35805420df3bcce5463 100644
--- a/interface/web/login/lib/lang/ru.lng
+++ b/interface/web/login/lib/lang/ru.lng
@@ -1,9 +1,12 @@
-
diff --git a/interface/web/mail/lib/lang/de_mail_user.lng b/interface/web/mail/lib/lang/de_mail_user.lng
index 469c5be36683e35585c5d83fb454f741ca9221f3..9c35018a88b5811a79fa409eb3f09acf64910279 100644
--- a/interface/web/mail/lib/lang/de_mail_user.lng
+++ b/interface/web/mail/lib/lang/de_mail_user.lng
@@ -28,4 +28,5 @@ $wb['welcome_mail_message'] = 'Welcome to your new email account.
Your webmaster.';
$wb['disableimap_txt'] = 'Disable IMAP';
$wb['disablepop3_txt'] = 'Disable POP3';
+$wb['password_strength_txt'] = 'Password strength';
?>
diff --git a/interface/web/mail/lib/lang/en_mail_user.lng b/interface/web/mail/lib/lang/en_mail_user.lng
index 17a68c3633c90e03039b67c04f311d0674cd605d..83116729910acbc4493d788ee02329d292f5fe89 100644
--- a/interface/web/mail/lib/lang/en_mail_user.lng
+++ b/interface/web/mail/lib/lang/en_mail_user.lng
@@ -4,6 +4,7 @@ $wb["btn_save_txt"] = 'Save';
$wb["btn_cancel_txt"] = 'Cancel';
$wb["email_txt"] = 'Email';
$wb["cryptpwd_txt"] = 'Password';
+$wb["password_strength_txt"] = 'Password strength';
$wb["active_txt"] = 'Active';
$wb["email_error_isemail"] = 'Email address is invalid.';
$wb["email_error_unique"] = 'Duplicate Email address.';
@@ -26,4 +27,4 @@ $wb["welcome_mail_subject"] = 'Welcome to your new email account.';
$wb["welcome_mail_message"] = "Welcome to your new email account.\n\nYour webmaster.";
$wb["disableimap_txt"] = 'Disable IMAP';
$wb["disablepop3_txt"] = 'Disable POP3';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/mail/lib/lang/ru_mail_alias.lng b/interface/web/mail/lib/lang/ru_mail_alias.lng
index 025ef2659e6d7a701aaf30a9a7a764f128879eb7..4d42635546293edcb0b6e29abd18427294775d3f 100644
--- a/interface/web/mail/lib/lang/ru_mail_alias.lng
+++ b/interface/web/mail/lib/lang/ru_mail_alias.lng
@@ -1,12 +1,12 @@
diff --git a/interface/web/mail/lib/lang/ru_mail_alias_list.lng b/interface/web/mail/lib/lang/ru_mail_alias_list.lng
index d63745f0bf65268b6c6a8bcf77088210696cc68e..8eb0103628308e71a45ff10d496b0edbb379ffc0 100644
--- a/interface/web/mail/lib/lang/ru_mail_alias_list.lng
+++ b/interface/web/mail/lib/lang/ru_mail_alias_list.lng
@@ -1,14 +1,14 @@
diff --git a/interface/web/mail/lib/lang/ru_mail_blacklist.lng b/interface/web/mail/lib/lang/ru_mail_blacklist.lng
index 6b017baf48507839db66c4e888b99d413bc38d25..650f4e70e7959d03b6c242e373ac21c66266dc57 100644
--- a/interface/web/mail/lib/lang/ru_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/ru_mail_blacklist.lng
@@ -1,11 +1,11 @@
diff --git a/interface/web/mail/lib/lang/ru_mail_blacklist_list.lng b/interface/web/mail/lib/lang/ru_mail_blacklist_list.lng
index 89708e0f6975d44a120c5906986f426cc97f4485..3f6e2ec1890e5978cc9fa00bb8c21d0f71c68ec2 100644
--- a/interface/web/mail/lib/lang/ru_mail_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/ru_mail_blacklist_list.lng
@@ -1,16 +1,16 @@
diff --git a/interface/web/mail/lib/lang/ru_mail_content_filter.lng b/interface/web/mail/lib/lang/ru_mail_content_filter.lng
index 91613c34ed6c6e34f6f03ff18612d1b505a7ba07..f923950ea9fe5b7284832664d4916e9d7837ee12 100644
--- a/interface/web/mail/lib/lang/ru_mail_content_filter.lng
+++ b/interface/web/mail/lib/lang/ru_mail_content_filter.lng
@@ -1,11 +1,11 @@
diff --git a/interface/web/mail/lib/lang/ru_mail_content_filter_list.lng b/interface/web/mail/lib/lang/ru_mail_content_filter_list.lng
index 9e65b993f6fd20e94384b13f91a42e9220481847..85003d7dc893dda6984575cfec267d662c270586 100644
--- a/interface/web/mail/lib/lang/ru_mail_content_filter_list.lng
+++ b/interface/web/mail/lib/lang/ru_mail_content_filter_list.lng
@@ -1,14 +1,14 @@
diff --git a/interface/web/mail/lib/lang/ru_mail_domain.lng b/interface/web/mail/lib/lang/ru_mail_domain.lng
index e39f5ac5defc0d7d0ff64e531be3698bee8fb13a..8924d65c40ef096277300dd5eda25cafd1ed0f51 100644
--- a/interface/web/mail/lib/lang/ru_mail_domain.lng
+++ b/interface/web/mail/lib/lang/ru_mail_domain.lng
@@ -1,15 +1,15 @@
diff --git a/interface/web/mail/lib/lang/ru_mail_domain_catchall.lng b/interface/web/mail/lib/lang/ru_mail_domain_catchall.lng
index 5e66dbb9b8492029072def18dc35f8b85934bccf..e32aa9a958311575389a1f1966665611ebf14db4 100644
--- a/interface/web/mail/lib/lang/ru_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/ru_mail_domain_catchall.lng
@@ -1,11 +1,11 @@
diff --git a/interface/web/mail/lib/lang/ru_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/ru_mail_domain_catchall_list.lng
index 042317aa05872e89a09b4e1c2d8cb0f4f24bb0a2..89155a0f398031c8fd67c67761715fc14fe48218 100644
--- a/interface/web/mail/lib/lang/ru_mail_domain_catchall_list.lng
+++ b/interface/web/mail/lib/lang/ru_mail_domain_catchall_list.lng
@@ -1,15 +1,15 @@
diff --git a/interface/web/mail/lib/lang/ru_mail_domain_list.lng b/interface/web/mail/lib/lang/ru_mail_domain_list.lng
index 633d294ae1a9b2bcff604aac906a2bd94539fc7b..e9c78667a56816e1137110d8fd1035cc6d407f1e 100644
--- a/interface/web/mail/lib/lang/ru_mail_domain_list.lng
+++ b/interface/web/mail/lib/lang/ru_mail_domain_list.lng
@@ -1,13 +1,13 @@
diff --git a/interface/web/mail/lib/lang/ru_mail_forward.lng b/interface/web/mail/lib/lang/ru_mail_forward.lng
index 574330c589761029fdd7b550eeaf2cf0f878ddc1..2933e472ef84b5a5cddafe8dff98d9c93ceaebb5 100644
--- a/interface/web/mail/lib/lang/ru_mail_forward.lng
+++ b/interface/web/mail/lib/lang/ru_mail_forward.lng
@@ -1,8 +1,8 @@
diff --git a/interface/web/mail/lib/lang/ru_mail_forward_list.lng b/interface/web/mail/lib/lang/ru_mail_forward_list.lng
index 1fb099192c9f219a9723786b137d15b6ca6a058a..85ae27fb15f0a788f80abd3022be0403edd08d59 100644
--- a/interface/web/mail/lib/lang/ru_mail_forward_list.lng
+++ b/interface/web/mail/lib/lang/ru_mail_forward_list.lng
@@ -1,14 +1,14 @@
diff --git a/interface/web/mail/lib/lang/ru_mail_get.lng b/interface/web/mail/lib/lang/ru_mail_get.lng
index e5cd0c81dce6393099304f19bafeb5b0e89de715..48bae6246ed4e218ea43f2a27af199eb2fc4bfb7 100644
--- a/interface/web/mail/lib/lang/ru_mail_get.lng
+++ b/interface/web/mail/lib/lang/ru_mail_get.lng
@@ -1,13 +1,13 @@
diff --git a/interface/web/mail/lib/lang/ru_mail_get_list.lng b/interface/web/mail/lib/lang/ru_mail_get_list.lng
index 41a6a6685b945486d70fb778409263b5d5d60847..410a7a0e5f18655c99b6e9db3a4ccdfe00b4f1ac 100644
--- a/interface/web/mail/lib/lang/ru_mail_get_list.lng
+++ b/interface/web/mail/lib/lang/ru_mail_get_list.lng
@@ -1,15 +1,15 @@
diff --git a/interface/web/mail/lib/lang/ru_mail_spamfilter.lng b/interface/web/mail/lib/lang/ru_mail_spamfilter.lng
index b2c71b2a9096373b44b08ec41fc52f7b19fb971f..434ac1a6b2505fb98d22f6ed74ff4c04d31b2f65 100644
--- a/interface/web/mail/lib/lang/ru_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/ru_mail_spamfilter.lng
@@ -1,19 +1,19 @@
diff --git a/interface/web/mail/lib/lang/ru_mail_transport.lng b/interface/web/mail/lib/lang/ru_mail_transport.lng
index d181dfb2c676b75f0a214047295189a2344a2521..ccdd1a3a81ae89c779909777ada27870db6d1afe 100644
--- a/interface/web/mail/lib/lang/ru_mail_transport.lng
+++ b/interface/web/mail/lib/lang/ru_mail_transport.lng
@@ -1,12 +1,12 @@
diff --git a/interface/web/mail/lib/lang/ru_mail_transport_list.lng b/interface/web/mail/lib/lang/ru_mail_transport_list.lng
index 34c975f65963ddd4ab5cc371cca51bec09fecda6..38c89976ace88a0226a1bdb8e569dda5768f8156 100644
--- a/interface/web/mail/lib/lang/ru_mail_transport_list.lng
+++ b/interface/web/mail/lib/lang/ru_mail_transport_list.lng
@@ -1,15 +1,15 @@
diff --git a/interface/web/mail/lib/lang/ru_mail_user.lng b/interface/web/mail/lib/lang/ru_mail_user.lng
index e67da87ed3536ab2fcd90f2da02115d96059b462..b07e9ab4b499138a4268aa260614d643e4255b59 100644
--- a/interface/web/mail/lib/lang/ru_mail_user.lng
+++ b/interface/web/mail/lib/lang/ru_mail_user.lng
@@ -1,27 +1,32 @@
diff --git a/interface/web/mail/lib/lang/ru_mail_user_filter.lng b/interface/web/mail/lib/lang/ru_mail_user_filter.lng
index 29b4275987a971008ffe2c4454d5c2b95247181c..49879af9f4861c743d80302ee1f96e6d4acfeb93 100644
--- a/interface/web/mail/lib/lang/ru_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/ru_mail_user_filter.lng
@@ -1,11 +1,11 @@
diff --git a/interface/web/mail/lib/lang/ru_mail_user_filter_list.lng b/interface/web/mail/lib/lang/ru_mail_user_filter_list.lng
index 6eb1205b2da2d8d2984e6ffad96d5129eed37d33..5997faca043544ae43a2903027a4480dc0a66994 100644
--- a/interface/web/mail/lib/lang/ru_mail_user_filter_list.lng
+++ b/interface/web/mail/lib/lang/ru_mail_user_filter_list.lng
@@ -1,10 +1,10 @@
diff --git a/interface/web/mail/lib/lang/ru_mail_user_list.lng b/interface/web/mail/lib/lang/ru_mail_user_list.lng
index 9377a1b4f47b25fcc31741e3b938bef991bd1c66..d61f2d0d35b347f63724e88789bced80dc6199bf 100644
--- a/interface/web/mail/lib/lang/ru_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/ru_mail_user_list.lng
@@ -1,12 +1,12 @@
diff --git a/interface/web/mail/lib/lang/ru_mail_user_stats_list.lng b/interface/web/mail/lib/lang/ru_mail_user_stats_list.lng
index a5c7c544ff923d3c13af85f0420a0eb099e2d9a3..42ab4528d8c0a6e8d2bff7a1ca78780104b66b97 100644
--- a/interface/web/mail/lib/lang/ru_mail_user_stats_list.lng
+++ b/interface/web/mail/lib/lang/ru_mail_user_stats_list.lng
@@ -1,14 +1,14 @@
diff --git a/interface/web/mail/lib/lang/ru_mail_whitelist.lng b/interface/web/mail/lib/lang/ru_mail_whitelist.lng
index 1d5e438127cff76d76b97ce150ae2d2f1836991e..2c836f45eba6e1420b783cf0dc79caf3ff36697b 100644
--- a/interface/web/mail/lib/lang/ru_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/ru_mail_whitelist.lng
@@ -1,11 +1,11 @@
diff --git a/interface/web/mail/lib/lang/ru_mail_whitelist_list.lng b/interface/web/mail/lib/lang/ru_mail_whitelist_list.lng
index f58ad6fc9a9d8e2b2a7aa93d3880f3975653d015..6bdde260386fe2f3791a64943619f3edd37c8c8c 100644
--- a/interface/web/mail/lib/lang/ru_mail_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/ru_mail_whitelist_list.lng
@@ -1,16 +1,16 @@
diff --git a/interface/web/mail/lib/lang/ru_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/ru_spamfilter_blacklist.lng
index a2a9526a5e74098ebef057cf2bda0143f8407b39..cd03df92aef9f0e4bcfd269c06392478bcfd7ff5 100644
--- a/interface/web/mail/lib/lang/ru_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/ru_spamfilter_blacklist.lng
@@ -1,10 +1,10 @@
diff --git a/interface/web/mail/lib/lang/ru_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/ru_spamfilter_blacklist_list.lng
index 9217309054028288f22a00bffd2bf9a137893ff0..14b82ef1a1f53cab1ce64d08d80fa89cfee77945 100644
--- a/interface/web/mail/lib/lang/ru_spamfilter_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/ru_spamfilter_blacklist_list.lng
@@ -1,15 +1,15 @@
diff --git a/interface/web/mail/lib/lang/ru_spamfilter_config.lng b/interface/web/mail/lib/lang/ru_spamfilter_config.lng
index b421529c6624aa20d7322232e8620271f3b2e689..f47289e5d2edc050c31b8616dbac9e24104bd86c 100644
--- a/interface/web/mail/lib/lang/ru_spamfilter_config.lng
+++ b/interface/web/mail/lib/lang/ru_spamfilter_config.lng
@@ -1,22 +1,22 @@
diff --git a/interface/web/mail/lib/lang/ru_spamfilter_config_list.lng b/interface/web/mail/lib/lang/ru_spamfilter_config_list.lng
index a9cb6a9dbf5cae40bdfbd9d9531eb59a70f821a8..8a378415f4267b7d4737ef33a11b41d2ca890885 100644
--- a/interface/web/mail/lib/lang/ru_spamfilter_config_list.lng
+++ b/interface/web/mail/lib/lang/ru_spamfilter_config_list.lng
@@ -1,11 +1,11 @@
diff --git a/interface/web/mail/lib/lang/ru_spamfilter_policy.lng b/interface/web/mail/lib/lang/ru_spamfilter_policy.lng
index 7e845096234a3af4214b210840df409ad2564ab9..2db66fb818ccb96ec2e266363b3c89ed3203e00c 100644
--- a/interface/web/mail/lib/lang/ru_spamfilter_policy.lng
+++ b/interface/web/mail/lib/lang/ru_spamfilter_policy.lng
@@ -1,40 +1,40 @@
diff --git a/interface/web/mail/lib/lang/ru_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/ru_spamfilter_policy_list.lng
index 16ce75f44e63d8eb3f77a0f24e8b27e2c091d13f..36f3cee5422556e3f3cb622e609c9d105240e1cf 100644
--- a/interface/web/mail/lib/lang/ru_spamfilter_policy_list.lng
+++ b/interface/web/mail/lib/lang/ru_spamfilter_policy_list.lng
@@ -1,15 +1,15 @@
diff --git a/interface/web/mail/lib/lang/ru_spamfilter_users.lng b/interface/web/mail/lib/lang/ru_spamfilter_users.lng
index 9a3550a081a4fe2a153a2ebaa05d37e6b4e8c001..ac20ffd3262e517caca6bd632b031eba239ab589 100644
--- a/interface/web/mail/lib/lang/ru_spamfilter_users.lng
+++ b/interface/web/mail/lib/lang/ru_spamfilter_users.lng
@@ -1,10 +1,10 @@
diff --git a/interface/web/mail/lib/lang/ru_spamfilter_users_list.lng b/interface/web/mail/lib/lang/ru_spamfilter_users_list.lng
index cc7931bc1764c3e1dce8cb2c728f972531e3d260..856952efcc503df7c7f8eed5dfb8d3d61a739a5f 100644
--- a/interface/web/mail/lib/lang/ru_spamfilter_users_list.lng
+++ b/interface/web/mail/lib/lang/ru_spamfilter_users_list.lng
@@ -1,16 +1,16 @@
diff --git a/interface/web/mail/lib/lang/ru_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/ru_spamfilter_whitelist.lng
index a2a9526a5e74098ebef057cf2bda0143f8407b39..cd03df92aef9f0e4bcfd269c06392478bcfd7ff5 100644
--- a/interface/web/mail/lib/lang/ru_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/ru_spamfilter_whitelist.lng
@@ -1,10 +1,10 @@
diff --git a/interface/web/mail/lib/lang/ru_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/ru_spamfilter_whitelist_list.lng
index a2abe67d202d2195ceafd713f73c452425bd5d39..0d0952d08677b57e8999bea91d80284470cab1b3 100644
--- a/interface/web/mail/lib/lang/ru_spamfilter_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/ru_spamfilter_whitelist_list.lng
@@ -1,15 +1,15 @@
diff --git a/interface/web/mail/templates/mail_user_mailbox_edit.htm b/interface/web/mail/templates/mail_user_mailbox_edit.htm
index f4f986c19beaa49dc4e06e94447c56fc69d73eba..4ac4b120c7b23aad4d5f8e4bdc1de190294718d9 100644
--- a/interface/web/mail/templates/mail_user_mailbox_edit.htm
+++ b/interface/web/mail/templates/mail_user_mailbox_edit.htm
@@ -11,7 +11,12 @@
-
+
+
+
+
+
+
diff --git a/interface/web/monitor/lib/lang/de.lng b/interface/web/monitor/lib/lang/de.lng
index 2a33710bfdf2bbf2141fd4f6c51a137ef29b7796..4e536083272fd61e6210ddf877b601c0a2ec120b 100644
--- a/interface/web/monitor/lib/lang/de.lng
+++ b/interface/web/monitor/lib/lang/de.lng
@@ -1,11 +1,4 @@
diff --git a/interface/web/sites/lib/lang/de_database.lng b/interface/web/sites/lib/lang/de_database.lng
index f200faa15296e502d5c04a1a38c8c2dcd7c45423..94c78b3bc81fc0a0cf8c858f0b42fdaaf39b9a36 100644
--- a/interface/web/sites/lib/lang/de_database.lng
+++ b/interface/web/sites/lib/lang/de_database.lng
@@ -19,4 +19,5 @@ $wb['database_user_error_regex'] = 'Invalid database user name. The username may
$wb['limit_database_txt'] = 'The max. number of databases is reached.';
$wb['database_name_change_txt'] = 'The database name can not be changed';
$wb['database_charset_change_txt'] = 'The database charset can not be changed';
+$wb['password_strength_txt'] = 'Password strength';
?>
diff --git a/interface/web/sites/lib/lang/de_ftp_user.lng b/interface/web/sites/lib/lang/de_ftp_user.lng
index 33110cdca87b433a7056854086a9a6733170995e..99fd1c2c103dbd97589cb5a652189091d1c02a68 100644
--- a/interface/web/sites/lib/lang/de_ftp_user.lng
+++ b/interface/web/sites/lib/lang/de_ftp_user.lng
@@ -22,4 +22,5 @@ $wb['username_error_regex'] = 'The username contains charachters that are not al
$wb['quota_size_error_empty'] = 'Quota is empty.';
$wb['uid_error_empty'] = 'GID empty.';
$wb['directory_error_empty'] = 'Directory empty.';
+$wb['password_strength_txt'] = 'Password strength';
?>
diff --git a/interface/web/sites/lib/lang/de_shell_user.lng b/interface/web/sites/lib/lang/de_shell_user.lng
index 21aed993512907b02426b755ec28ed9def703cd1..0b65123bd8812a7f778e0528af48c9b4bf4db94f 100644
--- a/interface/web/sites/lib/lang/de_shell_user.lng
+++ b/interface/web/sites/lib/lang/de_shell_user.lng
@@ -19,4 +19,5 @@ $wb['quota_size_error_empty'] = 'Quota is empty.';
$wb['uid_error_empty'] = 'GID empty.';
$wb['directory_error_empty'] = 'Directory empty.';
$wb['limit_shell_user_txt'] = 'The max number of shell users is reached.';
+$wb['password_strength_txt'] = 'Password strength';
?>
diff --git a/interface/web/sites/lib/lang/de_web_domain.lng b/interface/web/sites/lib/lang/de_web_domain.lng
index c5982a226c07efeda063c9597e700462e8c3dcdf..bb9aff49733553ebd2e4f7535ea5602d2e4dfa37 100644
--- a/interface/web/sites/lib/lang/de_web_domain.lng
+++ b/interface/web/sites/lib/lang/de_web_domain.lng
@@ -40,4 +40,10 @@ $wb['domain_error_regex'] = 'Domain name invalid.';
$wb['hd_quota_error_empty'] = 'Harddisk quota is empty.';
$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['is_subdomainwww_txt'] = 'www. Subdomain';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
?>
diff --git a/interface/web/sites/lib/lang/de_web_domain_list.lng b/interface/web/sites/lib/lang/de_web_domain_list.lng
index a73d5544972075e2006318ba483762a50075a6d5..933fff00c6e0e00145aa575d60625cc541eef0b9 100644
--- a/interface/web/sites/lib/lang/de_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/de_web_domain_list.lng
@@ -1,6 +1,6 @@
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/en_ftp_user.lng b/interface/web/sites/lib/lang/en_ftp_user.lng
index 0b589bc536182f846d83482c94ffd970481616ba..e6b555701a425a0d9d30a40f5897fc6fdb056f5a 100644
--- a/interface/web/sites/lib/lang/en_ftp_user.lng
+++ b/interface/web/sites/lib/lang/en_ftp_user.lng
@@ -13,6 +13,7 @@ $wb["server_id_txt"] = 'Server';
$wb["parent_domain_id_txt"] = 'Website';
$wb["username_txt"] = 'Username';
$wb["password_txt"] = 'Password';
+$wb["password_strength_txt"] = 'Password strength';
$wb["quota_size_txt"] = 'Harddisk-Quota';
$wb["active_txt"] = 'Active';
$wb["limit_ftp_user_txt"] = 'The max. number of FTP users for your account is reached.';
@@ -23,4 +24,4 @@ $wb["quota_size_error_empty"] = 'Quota is empty.';
$wb["uid_error_empty"] = 'UID empty.';
$wb["uid_error_empty"] = 'GID empty.';
$wb["directory_error_empty"] = 'Directory empty.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/en_shell_user.lng b/interface/web/sites/lib/lang/en_shell_user.lng
index af2be9581bec911f7c1f31f50de19cb76bedd91e..1ffa520b09641b80ca294f0ff058f3347e4027dd 100644
--- a/interface/web/sites/lib/lang/en_shell_user.lng
+++ b/interface/web/sites/lib/lang/en_shell_user.lng
@@ -9,6 +9,7 @@ $wb["server_id_txt"] = 'Server';
$wb["parent_domain_id_txt"] = 'Site';
$wb["username_txt"] = 'Username';
$wb["password_txt"] = 'Password';
+$wb["password_strength_txt"] = 'Password strength';
$wb["chroot_txt"] = 'Chroot Shell';
$wb["quota_size_txt"] = 'Quota';
$wb["active_txt"] = 'Active';
@@ -20,4 +21,4 @@ $wb["uid_error_empty"] = 'UID empty.';
$wb["uid_error_empty"] = 'GID empty.';
$wb["directory_error_empty"] = 'Directory empty.';
$wb["limit_shell_user_txt"] = 'The max number of shell users is reached.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm
index 65fe16a04dcf102290fe9b4cd3b9fcf5ce50a242..757755b6947e0e9a4f3152378fadd48a23f99ac2 100644
--- a/interface/web/sites/templates/database_edit.htm
+++ b/interface/web/sites/templates/database_edit.htm
@@ -34,7 +34,12 @@
- *
+ *
+
+
+
+
+
diff --git a/interface/web/sites/templates/ftp_user_edit.htm b/interface/web/sites/templates/ftp_user_edit.htm
index 7faf040dce7801043e5e333d6b217c50bf12d83d..151cb7db4271ee6df705278aa8595b60ebaeb628 100644
--- a/interface/web/sites/templates/ftp_user_edit.htm
+++ b/interface/web/sites/templates/ftp_user_edit.htm
@@ -14,7 +14,12 @@
-
+
+
+
+
+
+
diff --git a/interface/web/sites/templates/shell_user_edit.htm b/interface/web/sites/templates/shell_user_edit.htm
index baa47a02bb0eec3ec2590041e598b08848296d4e..1cf37e7a0256cab0a996efb90a46f7882b0bcb80 100644
--- a/interface/web/sites/templates/shell_user_edit.htm
+++ b/interface/web/sites/templates/shell_user_edit.htm
@@ -14,7 +14,12 @@
-
+
+
+
+
+
+
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index 2f05a37aeccc2dac72484bd8e709574cb639b02f..10e3ab02e87797536fe9f32c3dd4f26e3a44b218 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -13,8 +13,8 @@
-
-
+
+
diff --git a/interface/web/tools/lib/lang/de.lng b/interface/web/tools/lib/lang/de.lng
index b216fef81f72bbb421c132f2679e83aa6f566c12..bea9c7867402d951263cafad2558efbe2d83abcc 100644
--- a/interface/web/tools/lib/lang/de.lng
+++ b/interface/web/tools/lib/lang/de.lng
@@ -1,4 +1,6 @@
diff --git a/interface/web/tools/lib/lang/de_usersettings.lng b/interface/web/tools/lib/lang/de_usersettings.lng
index 7f7cc5b6eb7faaff6a0718769d9792c81a6ce68d..363a9952f3a5864ad12aa9bd4c1b24ea2521bac6 100644
--- a/interface/web/tools/lib/lang/de_usersettings.lng
+++ b/interface/web/tools/lib/lang/de_usersettings.lng
@@ -4,4 +4,7 @@ $wb['language_txt'] = 'Language';
$wb['btn_save_txt'] = 'Save';
$wb['btn_cancel_txt'] = 'Cancel';
$wb['password_mismatch'] = 'The password in the second password field does not match the first password.';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['Form to edit the user password and language.'] = 'Form to edit the user password and language.';
+$wb['Settings'] = 'Settings';
?>
diff --git a/interface/web/tools/lib/lang/en_usersettings.lng b/interface/web/tools/lib/lang/en_usersettings.lng
index a2d4d30225464ea88ed524f96c123aaa6aea8f1c..1497848d8100ab1cf63efce11bacaca933d51f1f 100644
--- a/interface/web/tools/lib/lang/en_usersettings.lng
+++ b/interface/web/tools/lib/lang/en_usersettings.lng
@@ -1,9 +1,10 @@
\ No newline at end of file
+?>
diff --git a/interface/web/tools/lib/lang/it_usersettings.lng b/interface/web/tools/lib/lang/it_usersettings.lng
index 43fbc7e38c1f1e80ef1635f634f5b242573cc646..9dd67bb37feb77b43e30ed9a1846a5f3d425305c 100644
--- a/interface/web/tools/lib/lang/it_usersettings.lng
+++ b/interface/web/tools/lib/lang/it_usersettings.lng
@@ -6,4 +6,5 @@ $wb['btn_cancel_txt'] = 'Annulla';
$wb['password_mismatch'] = 'Il secondo campo password non corrisponde non il primo.';
$wb['Form to edit the user password and language.'] = 'Form per modificare la password e la lingua dell`utente.';
$wb['Settings'] = 'Impostazioni';
+$wb['password_strength_txt'] = 'Password strength';
?>
diff --git a/interface/web/tools/templates/user_settings.htm b/interface/web/tools/templates/user_settings.htm
index 3ec8502cbf6e9773bb1c8c081688e5988da1542c..b82eb3038992d8b61a7d2de1e5e23c556663952a 100644
--- a/interface/web/tools/templates/user_settings.htm
+++ b/interface/web/tools/templates/user_settings.htm
@@ -6,12 +6,17 @@