Skip to content

Commit f66aaef

Browse files
author
karailiev
committed
+ added password strength meter
1 parent c213c38 commit f66aaef

File tree

121 files changed

+1335
-1047
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+1335
-1047
lines changed

‎interface/lib/config.inc.php‎

Lines changed: 84 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/*
3-
Copyright (c) 2007, Till Brehm, Falko Timme, projektfarm Gmbh
3+
Copyright (c) 2008, Till Brehm, Falko Timme, projektfarm Gmbh
44
All rights reserved.
55
66
Redistribution and use in source and binary forms, with or without modification,
@@ -27,12 +27,20 @@
2727
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2828
*/
2929

30-
error_reporting(E_ALL|E_NOTICE);
30+
//** Web-only
31+
if( !empty($_SERVER['DOCUMENT_ROOT']) ) {
3132

32-
header('Pragma: no-cache');
33-
header('Cache-Control: no-store, no-cache, max-age=0, must-revalidate');
34-
header('Content-Type: text/html; charset=utf-8');
35-
//* TODO: Js caching - pedro
33+
Header("Pragma: no-cache");
34+
Header("Cache-Control: no-store, no-cache, max-age=0, must-revalidate");
35+
Header("Content-Type: text/html");
36+
37+
ini_set('register_globals',0);
38+
}
39+
40+
$conf["app_title"] = "ISPConfig";
41+
$conf["app_version"] = "3.0.0";
42+
$conf["modules_available"] = "admin,mail,sites,monitor,client,dns";
43+
$conf["interface_logout_url"] = "";
3644

3745
//** Key paramaters
3846
define('ISPC_APP_TITLE', 'ISPConfig');
@@ -51,78 +59,76 @@
5159
define('ISPC_WEB_TEMP_PATH', ISPC_WEB_PATH.'/temp'); // Path for downloads, accessible via browser
5260
define('ISPC_CACHE_PATH', ISPC_ROOT_PATH.'/cache');
5361

62+
//** Interface settings
5463
define('ISPC_INTERFACE_MODULES_ENABLED', 'mail,sites,dns,tools');
5564

56-
//********************************************************************************
57-
//** Future Code idea - pedro - rfc
58-
//** >>>>
59-
/* Database connection
60-
The only time paramaters are needed is to connect, otherwise the variables
61-
are not required "around" the application. ie Connected and done.
62-
Prefered is an array as $DB in capitals, ie
63-
$DB['engine'] = 'type';
64-
$DB['host'] = 'ip';
65-
$DB['user'] = 'me';
66-
$DB['password'] = 'secret';
67-
$DB['database'] = 'db_name';
68-
69-
The connection paramaters are all contained within one array structure
70-
With this array structure the connection can be passed around, to functions
71-
However it can also leak so it can be destroyed eg
72-
$dbClass->connect($DB);
73-
unset($DB); // only the paranoid survive
74-
75-
Also there is a scenario where we are devloping and using this file
76-
and the database paramaters might leak into svn etc.
77-
(This idea is borrowed from the tikiwiki.org project)
78-
To resolve this there is a file called db_local.php.skel which is not detected
79-
rename this to db_local.php and edit the paramaters.
65+
66+
/*
67+
Server variables
8068
*/
8169

82-
//* Detect the local database settings ie $DB array()
83-
//* Copy db_local.php.skel for and change for local development
84-
if(file_exists(dirname(__FILE__).'/db_local.php')){
85-
require_once(dirname(__FILE__).'/db_local.php');
86-
$conf['db_type'] = $DB['type'];
87-
$conf['db_host'] = $DB['host'];
88-
$conf['db_user'] = $DB['user'];
89-
$conf['db_password'] = $DB['password'];
90-
$conf['db_database'] = $DB['database'];
91-
}else{
92-
//** Database Settings
93-
$conf['db_type'] = 'mysql';
94-
$conf['db_host'] = 'localhost';
95-
$conf['db_user'] = 'root';
96-
$conf['db_password'] = '';
97-
$conf['db_database'] = 'ispconfig3';
98-
}
70+
$conf["server_id"] = "{server_id}";
71+
9972

100-
//** Database Settings
101-
/* See above
102-
$conf['db_type'] = 'mysql';
103-
$conf['db_host'] = 'localhost';
104-
$conf['db_user'] = 'root';
105-
$conf['db_password'] = '';
106-
$conf['db_database'] = 'ispconfig3';
73+
/*
74+
Database Settings
10775
*/
10876

77+
$conf["db_type"] = 'mysql';
78+
$conf["db_host"] = 'localhost';
79+
$conf["db_database"] = 'dbispconfig';
80+
$conf["db_user"] = 'ispconfig';
81+
$conf["db_password"] = 'e8605b27a4360d135f62129627d8d9ad';
10982

11083

111-
//** External programs
112-
//$conf["programs"]["convert"] = "/usr/bin/convert";
113-
$conf['programs']['wput'] = ISPC_ROOT_PATH."\\tools\\wput\\wput.exe";
84+
/*
85+
Path Settings (Do not change!)
86+
*/
87+
88+
$conf["rootpath"] = substr(dirname(__FILE__),0,-4);
89+
$conf["fs_div"] = "/"; // File system divider, \\ on windows and / on linux and unix
90+
$conf["classpath"] = $conf["rootpath"].$conf["fs_div"]."lib".$conf["fs_div"]."classes";
91+
$conf["temppath"] = $conf["rootpath"].$conf["fs_div"]."temp";
11492

11593

116-
//** Themes
117-
$conf['theme'] = 'default';
118-
$conf['html_content_encoding'] = 'text/html; charset=utf-8';
94+
define("DIR_TRENNER",$conf["fs_div"]);
95+
define("SERVER_ROOT",$conf["rootpath"]);
96+
define("INCLUDE_ROOT",SERVER_ROOT.DIR_TRENNER."lib");
97+
define("CLASSES_ROOT",INCLUDE_ROOT.DIR_TRENNER."classes");
11998

120-
//** Default Language
121-
$conf['language'] = 'en';
99+
define("DB_TYPE",$conf["db_type"]);
100+
define("DB_HOST",$conf["db_host"]);
101+
define("DB_DATABASE",$conf["db_database"]);
102+
define("DB_USER",$conf["db_user"]);
103+
define("DB_PASSWORD",$conf["db_password"]);
104+
105+
/*
106+
Logging
107+
*/
122108

123-
//** Auto Load Modules
124-
$conf['start_db'] = true;
125-
$conf['start_session'] = true;
109+
$conf["log_file"] = '/var/log/ispconfig/ispconfig.log';
110+
$conf["log_priority"] = 2; // 0 = Debug, 1 = Warning, 2 = Error
111+
112+
/*
113+
Allow software package installations
114+
*/
115+
116+
$conf['software_updates_enabled'] = false;
117+
118+
119+
/*
120+
Themes
121+
*/
122+
123+
$conf["theme"] = 'default';
124+
$conf["html_content_encoding"] = 'text/html; charset=iso-8859-1';
125+
$conf["logo"] = 'themes/default/images/mydnsconfig_logo.gif';
126+
127+
/*
128+
Default Language
129+
*/
130+
131+
$conf["language"] = 'en';
126132

127133
/*
128134
Misc.
@@ -131,18 +137,19 @@
131137
$conf["interface_logout_url"] = ""; // example: http://www.domain.tld/
132138

133139

134-
//** DNS Settings
140+
/*
141+
Auto Load Modules
142+
*/
143+
144+
$conf["start_db"] = true;
145+
$conf["start_session"] = true;
146+
147+
/*
148+
Constants
149+
*/
135150

136-
//* Automatically create PTR records?
137-
$conf['auto_create_ptr'] = 1;
138-
//* must be set if $conf['auto_create_ptr'] is 1. Don't forget the trailing dot!
139-
$conf['default_ns'] = 'ns1.example.com.';
140-
//* Admin email address. Must be set if $conf['auto_create_ptr'] is 1. Replace "@" with ".". Don't forget the trailing dot!
141-
$conf['default_mbox'] = 'admin.example.com.';
142-
$conf['default_ttl'] = 86400;
143-
$conf['default_refresh'] = 28800;
144-
$conf['default_retry'] = 7200;
145-
$conf['default_expire'] = 604800;
146-
$conf['default_minimum_ttl'] = 86400;
151+
define("LOGLEVEL_DEBUG",0);
152+
define("LOGLEVEL_WARN",1);
153+
define("LOGLEVEL_ERROR",2);
147154

148155
?>

‎interface/lib/lang/de.lng‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<?php
22
$wb['301'] = 'Modul für User nicht erlaubt.';
33
$wb['302'] = 'Modul ungültig.';
4-
$wb['303'] = ' ';
5-
$wb['304'] = ' Dieses Formular dient zum Anlegen eines englischsprachigen Eintrags zus�tzlich zu Ihrem deutschen Eintrag. Bitte vervollst�ndigen Sie die Daten, soweit erforderlich, in Englisch - die Inhalte aus den Drop-Down-Men�s werden automatisch �bersetzt:';
64
$wb['1001'] = 'Der Benutzername und das Passwort d�rfen nicht leer sein!';
75
$wb['1002'] = 'Der Benutzername und/oder das Passwort sind nicht korrekt!';
86
$wb['1003'] = 'Der Benutzername ist deaktiviert!';

‎interface/lib/lang/ru.lng‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@ $wb['delete_confirmation'] = 'Вы действительно хотите уд
88
$wb['error_no_view_permission'] = 'Вы не имеете прав для удаления или запись отсутсвует!';
99
$wb['error_no_delete_permission'] = 'Вы не имеете прав для удаления этой записи!';
1010
?>
11-

‎interface/web/admin/lib/lang/de_filesync_list.lng‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,4 @@ $wb['list_head_txt'] = 'Datei Synchronisation';
33
$wb['jobname_txt'] = 'Name';
44
$wb['ftp_host_txt'] = 'FTP Server';
55
$wb['local_path_txt'] = 'lokaler Pfad';
6-
$wb['page_txt'] = 'Page';
7-
$wb['page_of_txt'] = 'of';
8-
$wb['page_next_txt'] = 'Next';
9-
$wb['page_back_txt'] = 'Back';
10-
$wb['delete_txt'] = 'Delete';
11-
$wb['filter_txt'] = 'Filter';
126
?>

‎interface/web/admin/lib/lang/de_users.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,5 @@ $wb['username_unique'] = 'There is already a user with this username.';
2626
$wb['btn_save_txt'] = 'Save';
2727
$wb['btn_cancel_txt'] = 'Cancel';
2828
$wb['startmodule_err'] = 'Start module is not within modules.';
29+
$wb['password_strength_txt'] = 'Password strength';
2930
?>

‎interface/web/admin/lib/lang/en_users.lng‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ $wb["username_err"] = 'The username is too long or contains invalid characters.'
44
$wb["username_empty"] = 'The username is empty.';
55
$wb["username_unique"] = 'There is already a user with this username.';
66
$wb["passwort_txt"] = 'Password';
7+
$wb["password_strength_txt"] = 'Password strength';
78
$wb["modules_txt"] = 'Module';
89
$wb["startmodule_txt"] = 'Startmodule';
910
$wb["app_theme_txt"] = 'Design';
@@ -27,4 +28,4 @@ $wb["active_txt"] = 'Active';
2728
$wb["btn_save_txt"] = 'Save';
2829
$wb["btn_cancel_txt"] = 'Cancel';
2930
$wb["startmodule_err"] = 'Start module is not within modules.';
30-
?>
31+
?>

‎interface/web/admin/lib/lang/ru.lng‎

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,34 @@
11
<?php
2-
3-
$wb[1001] = "Имя пользователя или пароль пусты.";
4-
$wb[1002] = "Имя пользователя или пароль неправильны.";
5-
2+
$wb['1001'] = 'Имя пользователя или пароль пусты.';
3+
$wb['1002'] = 'Имя пользователя или пароль неправильны.';
4+
$wb['Firewall'] = 'Firewall';
5+
$wb['Groups'] = 'Groups';
6+
$wb['groups_description'] = 'Form to edit systemuser groups.';
7+
$wb['Server'] = 'Server';
8+
$wb['Services'] = 'Services';
9+
$wb['Config'] = 'Config';
10+
$wb['Server Config'] = 'Server Config';
11+
$wb['Mail'] = 'Mail';
12+
$wb['Getmail'] = 'Getmail';
13+
$wb['Web'] = 'Web';
14+
$wb['FastCGI'] = 'FastCGI';
15+
$wb['Jailkit'] = 'Jailkit';
16+
$wb['System'] = 'System';
17+
$wb['Add user'] = 'Add user';
18+
$wb['Edit user'] = 'Edit user';
19+
$wb['CP Users'] = 'CP Users';
20+
$wb['Add group'] = 'Add group';
21+
$wb['Edit group'] = 'Edit group';
22+
$wb['Edit server'] = 'Edit server';
23+
$wb['Edit Server IP'] = 'Edit Server IP';
24+
$wb['Servers'] = 'Servers';
25+
$wb['Sync. Now'] = 'Sync. Now';
26+
$wb['DB Sync.'] = 'DB Sync.';
27+
$wb['Languages'] = 'Languages';
28+
$wb['New Language'] = 'New Language';
29+
$wb['Export'] = 'Export';
30+
$wb['Import'] = 'Import';
31+
$wb['Language Editor'] = 'Language Editor';
32+
$wb['Software'] = 'Software';
33+
$wb['Repositories'] = 'Repositories';
634
?>

‎interface/web/admin/lib/lang/ru_dbsync.lng‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?php
2-
$wb["jobname_txt"] = 'Имя';
3-
$wb["jobname_err"] = 'Поле "Name" пустое.';
4-
$wb["sync_interval_minutes_txt"] = 'Интервал (Min.)';
5-
$wb["db_type_txt"] = 'DB Тип';
6-
$wb["db_host_txt"] = 'DB Host';
7-
$wb["db_name_txt"] = 'DB Name';
8-
$wb["db_username_txt"] = 'DB Пользователь';
9-
$wb["db_password_txt"] = 'DB Пароль';
10-
$wb["db_tables_txt"] = 'Таблицы';
11-
$wb["empty_datalog_txt"] = 'Удалить диалог после синхронизаии.';
12-
$wb["sync_datalog_external_txt"] = 'Fill external datalog.';
13-
$wb["active_txt"] = 'активный';
14-
$wb["btn_save_txt"] = 'Сохранить';
15-
$wb["btn_cancel_txt"] = 'Закончить';
2+
$wb['jobname_txt'] = 'Имя';
3+
$wb['jobname_err'] = 'Поле Name пустое.';
4+
$wb['sync_interval_minutes_txt'] = 'Интервал (Min.)';
5+
$wb['db_type_txt'] = 'DB Тип';
6+
$wb['db_host_txt'] = 'DB Host';
7+
$wb['db_name_txt'] = 'DB Name';
8+
$wb['db_username_txt'] = 'DB Пользователь';
9+
$wb['db_password_txt'] = 'DB Пароль';
10+
$wb['db_tables_txt'] = 'Таблицы';
11+
$wb['empty_datalog_txt'] = 'Удалить диалог после синхронизаии.';
12+
$wb['sync_datalog_external_txt'] = 'Fill external datalog.';
13+
$wb['active_txt'] = 'активный';
14+
$wb['btn_save_txt'] = 'Сохранить';
15+
$wb['btn_cancel_txt'] = 'Закончить';
1616
?>

‎interface/web/admin/lib/lang/ru_dbsync_list.lng‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
<?php
2-
$wb["list_head_txt"] = 'Синхронизация БД';
3-
$wb["jobname_txt"] = 'Jobname';
4-
$wb["db_host_txt"] = 'DB Host';
5-
$wb["db_name_txt"] = 'DB Name';
6-
7-
$wb["page_txt"] = 'Страница';
8-
$wb["page_of_txt"] = 'из';
9-
$wb["page_next_txt"] = 'Дальше';
10-
$wb["page_back_txt"] = 'Назад';
11-
$wb["delete_txt"] = 'Удалить';
12-
$wb["filter_txt"] = 'Фильтр';
13-
$wb["add_new_record_txt"] = 'Добавить новую DBSync запись';
2+
$wb['list_head_txt'] = 'Синхронизация БД';
3+
$wb['jobname_txt'] = 'Jobname';
4+
$wb['db_host_txt'] = 'DB Host';
5+
$wb['db_name_txt'] = 'DB Name';
6+
$wb['page_txt'] = 'Страница';
7+
$wb['page_of_txt'] = 'из';
8+
$wb['page_next_txt'] = 'Дальше';
9+
$wb['page_back_txt'] = 'Назад';
10+
$wb['delete_txt'] = 'Удалить';
11+
$wb['filter_txt'] = 'Фильтр';
12+
$wb['add_new_record_txt'] = 'Добавить новую DBSync запись';
1413
?>

‎interface/web/admin/lib/lang/ru_filesync.lng‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?php
2-
$wb["jobname_txt"] = 'Jobname';
3-
$wb["jobname_err"] = 'Jobname is empty.';
4-
$wb["sync_interval_minutes_txt"] = 'Intervall (Min.)';
5-
$wb["ftp_host_txt"] = 'FTP Host';
6-
$wb["ftp_path_txt"] = 'FTP Path';
7-
$wb["ftp_username_txt"] = 'FTP Пользователь';
8-
$wb["ftp_password_txt"] = 'FTP Пароль';
9-
$wb["local_path_txt"] = 'Local Path';
10-
$wb["wput_options_txt"] = 'Wput Options';
11-
$wb["active_txt"] = 'Активный';
2+
$wb['jobname_txt'] = 'Jobname';
3+
$wb['jobname_err'] = 'Jobname is empty.';
4+
$wb['sync_interval_minutes_txt'] = 'Intervall (Min.)';
5+
$wb['ftp_host_txt'] = 'FTP Host';
6+
$wb['ftp_path_txt'] = 'FTP Path';
7+
$wb['ftp_username_txt'] = 'FTP Пользователь';
8+
$wb['ftp_password_txt'] = 'FTP Пароль';
9+
$wb['local_path_txt'] = 'Local Path';
10+
$wb['wput_options_txt'] = 'Wput Options';
11+
$wb['active_txt'] = 'Активный';
1212
?>

0 commit comments

Comments
 (0)