Skip to content

Commit 26fc8cd

Browse files
ms217ms217
committed
Merge branch 'develop' into goaccess-move-files
2 parents bd38e5d + c3e4316 commit 26fc8cd

Some content is hidden

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

51 files changed

+349
-103
lines changed

‎README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# ISPConfig - Hosting Control Panel
22

3-
Nightly (master): [![pipeline status](https://git.ispconfig.org/ispconfig/ispconfig3/badges/master/pipeline.svg)](https://git.ispconfig.org/ispconfig/ispconfig3/commits/master)
4-
Stable branch: [![pipeline status](https://git.ispconfig.org/ispconfig/ispconfig3/badges/stable-3.1/pipeline.svg)](https://git.ispconfig.org/ispconfig/ispconfig3/commits/stable-3.1)
3+
Development branch: [![pipeline status](https://git.ispconfig.org/ispconfig/ispconfig3/badges/develop/pipeline.svg)](https://git.ispconfig.org/ispconfig/ispconfig3/commits/develop)
54

65

76
- Manage multiple servers from one control panel
@@ -11,4 +10,4 @@ Stable branch: [![pipeline status](https://git.ispconfig.org/ispconfig/ispconfig
1110
- Virtualization (OpenVZ)
1211
- Administrator, reseller and client login
1312
- Configuration mirroring and clusters
14-
- Open Source software (BSD license)
13+
- Open Source software (BSD license)

‎install/tpl/apache_ispconfig.conf.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ Alias /.well-known/acme-challenge /usr/local/ispconfig/interface/acme/.well-know
136136
Allow from all
137137
</tmpl_if>
138138
<IfModule mpm_itk_module>
139-
AssignUserId www-data www-data
139+
AssignUserId ispconfig ispconfig
140140
</IfModule>
141141
</Directory>
142142

‎interface/lib/classes/auth.inc.php‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,36 @@ public function check_security_permissions($permission) {
198198

199199
}
200200

201+
/**
202+
* Get the minimum password length.
203+
*/
204+
public function get_min_password_length() {
205+
global $app;
206+
$server_config_array = $app->getconf->get_global_config();
207+
$min_password_length = 8;
208+
if(isset($server_config_array['misc']['min_password_length'])) $min_password_length = $server_config_array['misc']['min_password_length'];
209+
return $min_password_length;
210+
}
211+
212+
/**
213+
* Get the minimum password strength.
214+
*/
215+
public function get_min_password_strength() {
216+
global $app;
217+
$server_config_array = $app->getconf->get_global_config();
218+
$min_password_strength = 0;
219+
if(isset($server_config_array['misc']['min_password_strength'])) $min_password_strength = $server_config_array['misc']['min_password_strength'];
220+
return $min_password_strength;
221+
}
222+
223+
/**
224+
* Generate a ranmdom password.
225+
*
226+
* @param int $minLength
227+
* Minimum number of characters.
228+
* @param boolean $special
229+
* Include special characters, like # and !
230+
*/
201231
public function get_random_password($minLength = 8, $special = false) {
202232
if($minLength < 8) $minLength = 8;
203233
$maxLength = $minLength + 5;

‎interface/lib/classes/remote.d/mail.inc.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,8 @@ public function mail_user_add($session_id, $client_id, $params){
222222
if (!isset($params['gid'])) $params['gid'] = -1;
223223
if (!isset($params['maildir_format'])) $params['maildir_format'] = 'maildir';
224224

225-
$affected_rows = $this->insertQuery('../mail/form/mail_user.tform.php', $client_id, $params);
226-
return $affected_rows;
225+
$mailuser_id = $this->insertQuery('../mail/form/mail_user.tform.php', $client_id, $params);
226+
return $mailuser_id;
227227
}
228228

229229
//* Update mail user

‎interface/lib/classes/validate_password.inc.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,8 @@ function password_check($field_name, $field_value, $validator) {
111111
$app->uses('ini_parser,getconf');
112112
$server_config_array = $app->getconf->get_global_config();
113113

114-
$min_password_strength = 0;
115-
$min_password_length = 5;
116-
if(isset($server_config_array['misc']['min_password_length'])) $min_password_length = $server_config_array['misc']['min_password_length'];
117-
if(isset($server_config_array['misc']['min_password_strength'])) $min_password_strength = $server_config_array['misc']['min_password_strength'];
114+
$min_password_length = $app->auth->get_min_password_length();
115+
$min_password_strength = $app->auth->get_min_password_strength();
118116

119117
if($min_password_strength > 0) {
120118
$lng_text = $app->lng('weak_password_txt');

‎interface/lib/lang/cz.lng‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?php
2-
$wb['conf_format_dateshort'] = 'Y-d-m';
2+
$wb['conf_format_dateshort'] = 'd. m. Y';
33
$wb['conf_format_datelong'] = 'l dS of F Y';
44
$wb['conf_format_timeshort'] = 'H:i';
55
$wb['conf_format_timelong'] = 'H:i:s';
6-
$wb['conf_format_datetime'] = 'Y-d-m H:i';
6+
$wb['conf_format_datetime'] = 'd. m. Y H:i';
77
$wb['number_format_decimals'] = '4';
88
$wb['number_format_decimals_client'] = '2';
99
$wb['number_format_dec_point'] = '.';
@@ -69,7 +69,7 @@ $wb['monthnamesshort_dec'] = 'Pro';
6969
$wb['datepicker_nextText'] = 'Další';
7070
$wb['datepicker_prevText'] = 'Předchozí';
7171
$wb['logout_txt'] = 'Odhlášení';
72-
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
72+
$wb['conf_format_dateshort_human_readable'] = 'dd. mm. yyyy';
7373
$wb['submit_confirmation'] = 'Opravdu chcete provést tuto akci ?';
7474
$wb['top_menu_mailuser'] = 'E-mail. uživ.';
7575
$wb['globalsearch_resultslimit_of_txt'] = 'z';
@@ -161,4 +161,4 @@ $wb['datalog_status_d_xmpp_user'] = 'Smazat XMPP uživatele';
161161
$wb['unlimited_txt'] = 'neomezeno';
162162
$wb['server_id_0_error_txt'] = 'Please select a valid Server. Server ID must be > 0.';
163163
$wb['datalog_changes_close_txt'] = 'Close';
164-
?>
164+
?>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ $wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
88
$wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
99
$wb['variables_txt'] = 'Variables';
1010
$wb['customer_viewable_txt'] = 'Customer viewable';
11-
$wb['required_php_snippets_txt'] = 'Requiered PHP Snippet';
11+
$wb['required_php_snippets_txt'] = 'Required PHP Snippet';
1212
$wb['update_sites_txt'] = 'Update sites using this snippet';
1313
?>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ $wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
88
$wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
99
$wb['variables_txt'] = 'Variables';
1010
$wb['customer_viewable_txt'] = 'Customer viewable';
11-
$wb['required_php_snippets_txt'] = 'Requiered PHP Snippet';
11+
$wb['required_php_snippets_txt'] = 'Required PHP Snippet';
1212
$wb['update_sites_txt'] = 'Update sites using this snippet';
1313
?>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ $wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
88
$wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
99
$wb['variables_txt'] = 'Variables';
1010
$wb['customer_viewable_txt'] = 'Customer viewable';
11-
$wb['required_php_snippets_txt'] = 'Requiered PHP Snippet';
11+
$wb['required_php_snippets_txt'] = 'Required PHP Snippet';
1212
$wb['update_sites_txt'] = 'Update sites using this snippet';
1313
?>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ $wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
88
$wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
99
$wb['variables_txt'] = 'Proměnné';
1010
$wb['customer_viewable_txt'] = 'Dostupná volba pro klienta';
11-
$wb['required_php_snippets_txt'] = 'Requiered PHP Snippet';
11+
$wb['required_php_snippets_txt'] = 'Required PHP Snippet';
1212
$wb['update_sites_txt'] = 'Update sites using this snippet';
1313
?>

0 commit comments

Comments
 (0)