From f66aaef4e353942d6d1711717d99f5d597482b0a Mon Sep 17 00:00:00 2001 From: karailiev Date: Thu, 20 Nov 2008 20:03:27 +0000 Subject: [PATCH] + added password strength meter --- interface/lib/config.inc.php | 161 +++++++++--------- interface/lib/lang/de.lng | 2 - interface/lib/lang/ru.lng | 1 - .../web/admin/lib/lang/de_filesync_list.lng | 6 - interface/web/admin/lib/lang/de_users.lng | 1 + interface/web/admin/lib/lang/en_users.lng | 3 +- interface/web/admin/lib/lang/ru.lng | 36 +++- interface/web/admin/lib/lang/ru_dbsync.lng | 28 +-- .../web/admin/lib/lang/ru_dbsync_list.lng | 23 ++- interface/web/admin/lib/lang/ru_filesync.lng | 20 +-- .../web/admin/lib/lang/ru_filesync_list.lng | 8 +- interface/web/admin/lib/lang/ru_firewall.lng | 18 +- .../web/admin/lib/lang/ru_firewall_list.lng | 24 +-- interface/web/admin/lib/lang/ru_groups.lng | 10 +- .../web/admin/lib/lang/ru_groups_list.lng | 20 +-- .../web/admin/lib/lang/ru_language_add.lng | 6 +- .../web/admin/lib/lang/ru_language_edit.lng | 1 - .../web/admin/lib/lang/ru_language_export.lng | 4 +- .../web/admin/lib/lang/ru_language_import.lng | 6 +- .../web/admin/lib/lang/ru_language_list.lng | 8 +- interface/web/admin/lib/lang/ru_server.lng | 22 +-- .../web/admin/lib/lang/ru_server_config.lng | 69 ++++---- .../admin/lib/lang/ru_server_config_list.lng | 16 +- interface/web/admin/lib/lang/ru_server_ip.lng | 12 +- .../web/admin/lib/lang/ru_server_ip_list.lng | 20 +-- .../web/admin/lib/lang/ru_server_list.lng | 30 ++-- interface/web/admin/lib/lang/ru_users.lng | 53 +++--- .../web/admin/lib/lang/ru_users_list.lng | 25 ++- .../web/admin/templates/users_user_edit.htm | 7 +- interface/web/client/lib/lang/de_client.lng | 1 + .../web/client/lib/lang/de_clients_list.lng | 2 +- interface/web/client/lib/lang/en_client.lng | 3 +- interface/web/client/lib/lang/it_client.lng | 1 + .../client/templates/client_edit_address.htm | 7 +- interface/web/designer/lib/lang/ru.lng | 1 - .../web/designer/lib/lang/ru_form_edit.lng | 46 +++-- .../web/designer/lib/lang/ru_form_list.lng | 10 +- .../web/designer/lib/lang/ru_form_show.lng | 33 ++-- .../web/designer/lib/lang/ru_module_edit.lng | 23 ++- .../web/designer/lib/lang/ru_module_list.lng | 6 +- .../lib/lang/ru_module_nav_item_edit.lng | 12 +- .../web/designer/lib/lang/ru_module_show.lng | 29 ++-- interface/web/dns/lib/lang/ru_dns_a.lng | 30 ++-- interface/web/dns/lib/lang/ru_dns_a_list.lng | 29 ++-- interface/web/dns/lib/lang/ru_dns_alias.lng | 30 ++-- interface/web/dns/lib/lang/ru_dns_cname.lng | 30 ++-- interface/web/dns/lib/lang/ru_dns_hinfo.lng | 30 ++-- interface/web/dns/lib/lang/ru_dns_mx.lng | 32 ++-- interface/web/dns/lib/lang/ru_dns_ns.lng | 30 ++-- interface/web/dns/lib/lang/ru_dns_ptr.lng | 30 ++-- interface/web/dns/lib/lang/ru_dns_rp.lng | 30 ++-- interface/web/dns/lib/lang/ru_dns_soa.lng | 48 +++--- .../web/dns/lib/lang/ru_dns_soa_list.lng | 26 +-- interface/web/dns/lib/lang/ru_dns_srv.lng | 30 ++-- interface/web/dns/lib/lang/ru_dns_txt.lng | 30 ++-- .../web/help/lib/lang/ru_support_message.lng | 1 - .../help/lib/lang/ru_support_message_list.lng | 2 +- interface/web/js/lib/lang/de_javascript.lng | 8 + interface/web/js/lib/lang/en_javascript.lng | 8 + interface/web/js/lib/lang/fr_javascript.lng | 8 + interface/web/js/lib/lang/it_javascript.lng | 8 + interface/web/js/lib/lang/nl_javascript.lng | 8 + interface/web/js/lib/lang/ru_javascript.lng | 8 + interface/web/js/lib/lang/se_javascript.lng | 8 + interface/web/js/{scrigo.js => scrigo.js.php} | 129 +++++++++++++- interface/web/login/lib/lang/ru.lng | 17 +- interface/web/mail/lib/lang/de_mail_user.lng | 1 + interface/web/mail/lib/lang/en_mail_user.lng | 3 +- interface/web/mail/lib/lang/ru_mail_alias.lng | 20 +-- .../web/mail/lib/lang/ru_mail_alias_list.lng | 24 +-- .../web/mail/lib/lang/ru_mail_blacklist.lng | 18 +- .../mail/lib/lang/ru_mail_blacklist_list.lng | 28 +-- .../mail/lib/lang/ru_mail_content_filter.lng | 18 +- .../lib/lang/ru_mail_content_filter_list.lng | 24 +-- .../web/mail/lib/lang/ru_mail_domain.lng | 26 +-- .../mail/lib/lang/ru_mail_domain_catchall.lng | 18 +- .../lib/lang/ru_mail_domain_catchall_list.lng | 26 +-- .../web/mail/lib/lang/ru_mail_domain_list.lng | 22 +-- .../web/mail/lib/lang/ru_mail_forward.lng | 12 +- .../mail/lib/lang/ru_mail_forward_list.lng | 24 +-- interface/web/mail/lib/lang/ru_mail_get.lng | 22 +-- .../web/mail/lib/lang/ru_mail_get_list.lng | 26 +-- .../web/mail/lib/lang/ru_mail_spamfilter.lng | 34 ++-- .../web/mail/lib/lang/ru_mail_transport.lng | 20 +-- .../mail/lib/lang/ru_mail_transport_list.lng | 26 +-- interface/web/mail/lib/lang/ru_mail_user.lng | 55 +++--- .../web/mail/lib/lang/ru_mail_user_filter.lng | 18 +- .../lib/lang/ru_mail_user_filter_list.lng | 16 +- .../web/mail/lib/lang/ru_mail_user_list.lng | 20 +-- .../mail/lib/lang/ru_mail_user_stats_list.lng | 24 +-- .../web/mail/lib/lang/ru_mail_whitelist.lng | 18 +- .../mail/lib/lang/ru_mail_whitelist_list.lng | 28 +-- .../mail/lib/lang/ru_spamfilter_blacklist.lng | 16 +- .../lib/lang/ru_spamfilter_blacklist_list.lng | 26 +-- .../mail/lib/lang/ru_spamfilter_config.lng | 40 ++--- .../lib/lang/ru_spamfilter_config_list.lng | 18 +- .../mail/lib/lang/ru_spamfilter_policy.lng | 76 ++++----- .../lib/lang/ru_spamfilter_policy_list.lng | 26 +-- .../web/mail/lib/lang/ru_spamfilter_users.lng | 16 +- .../lib/lang/ru_spamfilter_users_list.lng | 28 +-- .../mail/lib/lang/ru_spamfilter_whitelist.lng | 16 +- .../lib/lang/ru_spamfilter_whitelist_list.lng | 26 +-- .../mail/templates/mail_user_mailbox_edit.htm | 7 +- interface/web/monitor/lib/lang/de.lng | 29 +++- interface/web/sites/lib/lang/de_database.lng | 1 + interface/web/sites/lib/lang/de_ftp_user.lng | 1 + .../web/sites/lib/lang/de_shell_user.lng | 1 + .../web/sites/lib/lang/de_web_domain.lng | 6 + .../web/sites/lib/lang/de_web_domain_list.lng | 2 +- interface/web/sites/lib/lang/en_database.lng | 3 +- interface/web/sites/lib/lang/en_ftp_user.lng | 3 +- .../web/sites/lib/lang/en_shell_user.lng | 3 +- .../web/sites/templates/database_edit.htm | 7 +- .../web/sites/templates/ftp_user_edit.htm | 7 +- .../web/sites/templates/shell_user_edit.htm | 7 +- .../web/themes/default/templates/main.tpl.htm | 4 +- interface/web/tools/lib/lang/de.lng | 2 + .../web/tools/lib/lang/de_usersettings.lng | 3 + .../web/tools/lib/lang/en_usersettings.lng | 3 +- .../web/tools/lib/lang/it_usersettings.lng | 1 + .../web/tools/templates/user_settings.htm | 9 +- 121 files changed, 1335 insertions(+), 1047 deletions(-) create mode 100644 interface/web/js/lib/lang/de_javascript.lng create mode 100644 interface/web/js/lib/lang/en_javascript.lng create mode 100644 interface/web/js/lib/lang/fr_javascript.lng create mode 100644 interface/web/js/lib/lang/it_javascript.lng create mode 100644 interface/web/js/lib/lang/nl_javascript.lng create mode 100644 interface/web/js/lib/lang/ru_javascript.lng create mode 100644 interface/web/js/lib/lang/se_javascript.lng rename interface/web/js/{scrigo.js => scrigo.js.php} (70%) diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php index 72ded1fd08..3a8030af8a 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 d07898a875..3c5035c6e1 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 eae42884c8..2c8145854f 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 3655dda4c4..6851e5d989 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 e0ffa6135c..c93f4c7658 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 fb7b4badd7..f68a1d3208 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 bdbabb5d6a..318bcbaa68 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 6fe335ea8f..0bc7d10112 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 a04b77630d..f2261932de 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 2c29224388..ce7080b934 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 b8d5221e8f..ded71717e8 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 8da20ce5fb..866596b606 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 513f0afeea..380ea1cef3 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 4db46a1d1e..828d4884db 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 949acb66fe..82aedcb41d 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 b5cbb16694..3a92ac2d28 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 c8861c9a95..29a9522327 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 43f6418fc7..10dbc0497f 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 ea73366e0e..b502fd8ed9 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 b111e42570..79857c2f52 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 8695b82d55..e689a6456e 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 4f40b61178..6a1f6cc370 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 eab51c9b04..ac5dc42136 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 b6c6d31b30..d6ac978d11 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 921508a2ba..ea8e0bf64d 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 46e0de1174..99bd8cf1ec 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 353340d960..4a7151d8db 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 b02af601d8..c497f441a6 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'}
{tmpl_var name='modules'}
 diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng index 8176707ce9..ee75e5563c 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 b4e04e7483..776312a44e 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 3547789fb0..505f2f1e16 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 0bc2cb7798..e8c1194c7e 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 62a2de0c86..acb6c3546c 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 08e3b643f0..84c58a21f7 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 6f9678f139..e35e593421 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 6672a40245..bf5e22e25f 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 f959b75187..831ed35beb 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 fc7ac52245..2401318dd5 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 c96861d626..b1a7dafc32 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 5e72372966..bf1371fcd1 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 bbd66b3ce8..ec57188d0d 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 3d0346995f..dcd4c5e64f 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 39cbb742a1..391a5ae87a 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 4b66ca025e..047c807185 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 e42215abd6..af1e84ff11 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 41b34fda73..90eeb212b0 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 8cf3f4ca87..d9661d17ce 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 75fe9d62cb..05008b7075 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 abdcd5c737..e165b3cde4 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 23f42a479c..015a247cfd 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 f17bd78472..2114aec44b 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 c7309e2d3f..f00e1c0b9e 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 42215f3b47..7009d184a0 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 174eb7143b..ef309640e0 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 bc82ccd72c..ca4c1049fc 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 0000000000..2a6de41f1e --- /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 0000000000..2a6de41f1e --- /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 0000000000..2a6de41f1e --- /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 0000000000..2a6de41f1e --- /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 0000000000..2a6de41f1e --- /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 0000000000..2a6de41f1e --- /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 0000000000..2a6de41f1e --- /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 1b51dd0edd..6e6affb204 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 e5994adc60..41cd36de83 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 469c5be366..9c35018a88 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 17a68c3633..8311672991 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 025ef2659e..4d42635546 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 d63745f0bf..8eb0103628 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 6b017baf48..650f4e70e7 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 89708e0f69..3f6e2ec189 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 91613c34ed..f923950ea9 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 9e65b993f6..85003d7dc8 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 e39f5ac5de..8924d65c40 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 5e66dbb9b8..e32aa9a958 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 042317aa05..89155a0f39 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 633d294ae1..e9c78667a5 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 574330c589..2933e472ef 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 1fb099192c..85ae27fb15 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 e5cd0c81dc..48bae6246e 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 41a6a6685b..410a7a0e5f 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 b2c71b2a90..434ac1a6b2 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 d181dfb2c6..ccdd1a3a81 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 34c975f659..38c89976ac 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 e67da87ed3..b07e9ab4b4 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 29b4275987..49879af9f4 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 6eb1205b2d..5997faca04 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 9377a1b4f4..d61f2d0d35 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 a5c7c544ff..42ab4528d8 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 1d5e438127..2c836f45eb 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 f58ad6fc9a..6bdde26038 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 a2a9526a5e..cd03df92ae 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 9217309054..14b82ef1a1 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 b421529c66..f47289e5d2 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 a9cb6a9dbf..8a378415f4 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 7e84509623..2db66fb818 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 16ce75f44e..36f3cee542 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 9a3550a081..ac20ffd326 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 cc7931bc17..856952efcc 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 a2a9526a5e..cd03df92ae 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 a2abe67d20..0d0952d086 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 f4f986c19b..4ac4b120c7 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 2a33710bfd..4e53608327 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 f200faa152..94c78b3bc8 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 33110cdca8..99fd1c2c10 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 21aed99351..0b65123bd8 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 c5982a226c..bb9aff4973 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 a73d554497..933fff00c6 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 0b589bc536..e6b555701a 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 af2be9581b..1ffa520b09 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 65fe16a04d..757755b694 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 7faf040dce..151cb7db42 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 baa47a02bb..1cf37e7a02 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 2f05a37aec..10e3ab02e8 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 b216fef81f..bea9c78674 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 7f7cc5b6eb..363a9952f3 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 a2d4d30225..1497848d81 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 43fbc7e38c..9dd67bb37f 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 3ec8502cbf..b82eb30389 100644 --- a/interface/web/tools/templates/user_settings.htm +++ b/interface/web/tools/templates/user_settings.htm @@ -6,12 +6,17 @@
{tmpl_var name='Settings'} - + + + + +
+   - + -- GitLab