Skip to content

Commit 5d670ed

Browse files
author
Saket Hatwar
committed
lint
1 parent 41d56c4 commit 5d670ed

File tree

1 file changed

+32
-15
lines changed

1 file changed

+32
-15
lines changed

modules/my_preferences/php/my_preferences.class.inc

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@ class My_Preferences extends \NDB_Form
1111
{
1212
// Use gettext for error messages
1313
private const PASSWORD_ERROR_IS_EMAIL = 'Your password cannot be your email.';
14-
private const PASSWORD_ERROR_IS_USER = 'Your password cannot be your user name.';
14+
private const PASSWORD_ERROR_IS_USER =
15+
'Your password cannot be your user name.';
1516
private const PASSWORD_ERROR_NO_MATCH = 'The passwords do not match.';
16-
private const PASSWORD_ERROR_NO_CHANGE = 'New and old passwords are identical: please choose another one';
17+
private const PASSWORD_ERROR_NO_CHANGE =
18+
'New and old passwords are identical: please choose another one';
1719

1820
/**
1921
* Computes the initial values this page will be filled with.
@@ -231,7 +233,8 @@ class My_Preferences extends \NDB_Form
231233
// - must have at least one non-whitespace characters (i.e. required)
232234
// - once leading and trailing spaces are stripped, the field should
233235
// not exceed 120 chars
234-
$firstNameInvalidMsg = dgettext('my_preferences', "First name is required and should not exceed 120 characters");
236+
$firstNameInvalidMsg = dgettext('my_preferences',
237+
"First name is required and should not exceed 120 characters");
235238
$this->addBasicText(
236239
'First_name',
237240
dgettext('my_preferences', 'First name'),
@@ -247,7 +250,8 @@ class My_Preferences extends \NDB_Form
247250
// - must have at least one non-whitespace characters (i.e. required)
248251
// - once leading and trailing spaces are stripped, the field should
249252
// not exceed 120 chars
250-
$lastNameInvalidMsg = dgettext('my_preferences', "Last name is required and should not exceed 120 characters");
253+
$lastNameInvalidMsg = dgettext('my_preferences',
254+
"Last name is required and should not exceed 120 characters");
251255
$this->addBasicText(
252256
'Last_name',
253257
dgettext('my_preferences', 'Last name'),
@@ -266,27 +270,35 @@ class My_Preferences extends \NDB_Form
266270
dgettext('my_preferences', 'Email address'),
267271
[],
268272
[
269-
'oninvalid' => "this.setCustomValidity('" . dgettext('my_preferences', 'Email address is required') . "')",
273+
'oninvalid' => "this.setCustomValidity(
274+
'" . dgettext('my_preferences',
275+
'Email address is required') . "')",
270276
'onchange' => "this.setCustomValidity('')",
271277
]
272278
);
273279

274280
// email address rules
275-
$this->addRule('Email', dgettext('my_preferences', 'Email address is required'), 'required');
281+
$this->addRule('Email', dgettext('my_preferences',
282+
'Email address is required'),
283+
'required');
276284
$this->addRule(
277285
'Email',
278-
dgettext('my_preferences', 'Your email address must be less than 255 characters long'),
286+
dgettext('my_preferences',
287+
'Your email address must be less than 255 characters long'),
279288
'maxlength',
280289
"255"
281290
);
282291

283292
// password
284-
$this->form->addElement('password', 'Password_hash', dgettext('my_preferences', 'New Password'));
285-
$this->form->addElement('password', '__Confirm', dgettext('my_preferences', 'Confirm Password'));
293+
$this->form->addElement('password', 'Password_hash',
294+
dgettext('my_preferences', 'New Password'));
295+
$this->form->addElement('password', '__Confirm',
296+
dgettext('my_preferences', 'Confirm Password'));
286297

287298
// language preference
288299
$languages = \Utility::getLanguageList();
289-
$this->addSelect('language_preference', dgettext('my_preferences', 'Language preference'), $languages);
300+
$this->addSelect('language_preference', dgettext('my_preferences',
301+
'Language preference'), $languages);
290302

291303
// Notification headers
292304
$nGroup = [];
@@ -393,18 +405,21 @@ class My_Preferences extends \NDB_Form
393405
$plaintext = $values['Password_hash'];
394406

395407
if ($values['Email'] === $plaintext) {
396-
$errors['Password_Group'] = dgettext('my_preferences', self::PASSWORD_ERROR_IS_EMAIL);
408+
$errors['Password_Group'] = dgettext('my_preferences',
409+
self::PASSWORD_ERROR_IS_EMAIL);
397410
}
398411

399412
// Make sure the user is not using their username as their password.
400413
if ($this->identifier === $plaintext) {
401-
$errors['Password_Group'] = dgettext('my_preferences', self::PASSWORD_ERROR_IS_USER);
414+
$errors['Password_Group'] = dgettext('my_preferences',
415+
self::PASSWORD_ERROR_IS_USER);
402416
}
403417

404418
// Ensure that the password and confirm password fields match.
405419
// TODO This validation should be done on the front-end instead.
406420
if ($values['Password_hash'] !== $values['__Confirm']) {
407-
$errors['Password_Group'] = dgettext('my_preferences', self::PASSWORD_ERROR_NO_MATCH);
421+
$errors['Password_Group'] = dgettext('my_preferences',
422+
self::PASSWORD_ERROR_NO_MATCH);
408423
return $errors;
409424
}
410425

@@ -421,10 +436,12 @@ class My_Preferences extends \NDB_Form
421436
$decoded
422437
)
423438
) {
424-
$errors['Password_Group'] = dgettext('my_preferences', self::PASSWORD_ERROR_NO_CHANGE);
439+
$errors['Password_Group'] = dgettext('my_preferences',
440+
self::PASSWORD_ERROR_NO_CHANGE);
425441
}
426442
} catch (\InvalidArgumentException $e) {
427-
$errors['Password_Group'] = dgettext('my_preferences', $e->getMessage());
443+
$errors['Password_Group'] = dgettext('my_preferences',
444+
$e->getMessage());
428445
}
429446
}
430447

0 commit comments

Comments
 (0)