From eae8f36dab6e5e292e7bf8b171b6f0e6a4d50c00 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Mon, 24 Feb 2020 20:08:28 +0100 Subject: [PATCH] typos --- lam/HISTORY | 12 ++++++------ lam/docs/devel/account_pages.htm | 2 +- lam/docs/devel/type_list.htm | 2 +- lam/help/help.inc | 2 +- .../Horde_Mail/Horde/Mail/Transport.php | 2 +- .../3rdParty/tcpdf/include/barcodes/qrcode.php | 2 +- lam/lib/account.inc | 13 +++++++------ lam/lib/baseModule.inc | 18 +++++++++--------- lam/lib/config.inc | 6 +++--- lam/lib/export.inc | 2 +- lam/lib/html.inc | 6 +++--- lam/lib/lists.inc | 2 +- lam/lib/modules.inc | 2 +- lam/lib/modules/asteriskAccount.inc | 2 +- lam/lib/modules/asteriskExtension.inc | 4 ++-- lam/lib/modules/asteriskVoicemail.inc | 2 +- lam/lib/modules/inetOrgPerson.inc | 6 +++--- lam/lib/modules/posixAccount.inc | 4 ++-- lam/lib/modules/posixGroup.inc | 6 +++--- lam/lib/modules/quota.inc | 2 +- lam/lib/modules/sambaGroupMapping.inc | 2 +- lam/lib/modules/sambaSamAccount.inc | 4 ++-- lam/lib/modules/shadowAccount.inc | 2 +- lam/lib/modules/windowsUser.inc | 6 +++--- lam/lib/status.inc | 2 +- lam/lib/tools.inc | 4 ++-- lam/lib/tools/fileUpload.inc | 6 +++--- lam/lib/tools/importexport.inc | 4 ++-- lam/lib/tools/multiEdit.inc | 4 ++-- lam/lib/tools/ouEditor.inc | 4 ++-- lam/lib/tools/pdfEdit.inc | 4 ++-- lam/lib/tools/profileEditor.inc | 4 ++-- lam/lib/tools/schemaBrowser.inc | 4 ++-- lam/lib/tools/serverInfo.inc | 4 ++-- lam/lib/tools/tests.inc | 4 ++-- lam/lib/tools/webauthn.inc | 4 ++-- lam/lib/types/group.inc | 4 ++-- lam/templates/account/edit.php | 2 +- lam/templates/config/mainmanage.php | 2 +- lam/templates/delete.php | 2 +- lam/templates/upload/massBuildAccounts.php | 4 ++-- lam/templates/upload/massDoUpload.php | 2 +- lam/templates/upload/masscreate.php | 4 ++-- 43 files changed, 90 insertions(+), 89 deletions(-) diff --git a/lam/HISTORY b/lam/HISTORY index 8ba48ccc..2c85455a 100644 --- a/lam/HISTORY +++ b/lam/HISTORY @@ -313,7 +313,7 @@ March 2020 7.1 - LAM Pro: -> Password self reset and user self registration support to set a header text -> Sudo roles: support latest schema - -> Bind DLZ: automatic PTR management (disabled by default) and better formating of e.g. TTL values + -> Bind DLZ: automatic PTR management (disabled by default) and better formatting of e.g. TTL values 18.03.2014 4.5 @@ -505,7 +505,7 @@ March 2020 7.1 -> support to read user name from uid attribute -> added quota management - Personal: added additional options for account profiles - - Mail aliases: sort receipients (RFE 3170336) + - Mail aliases: sort recipients (RFE 3170336) - Asterisk: support all attributes (can be disabled in configuration) - Samba 3/Shadow: allow to sync expiration date (RFE 3147751) - LAM Pro: @@ -632,7 +632,7 @@ March 2020 7.1 21.01.2009 2.5.0 - LAM Pro: -> supports rfc2307bis schema for Unix groups (RFE 2111694) - -> added alias manangement (object classes alias + uidObject) (RFE 1912779) + -> added alias management (object classes alias + uidObject) (RFE 1912779) - Shadow: module is now optional when creating new accounts - Kolab: -> account extension is now optional @@ -958,7 +958,7 @@ March 2020 7.1 -> dynamic configuration options (based on modules) - all pages in UTF-8 - added developer documentation - - PHPDoc formated comments + - PHPDoc formatted comments - new plugin for managing MAC addresses (RFE 926017) - new plugin for managing NIS mail aliases (RFE 1050036) - new plugin for managing mail routing with inetLocalMailRecipient (RFE 1092137) @@ -1020,7 +1020,7 @@ March 2020 7.1 if magic_quotes_gpc in php.ini is was set to "Off", several pages did not work some smaller bugs in mass upload Samba hash values for hosts were not correct - Unix passwords could be disabled but not reenabled + Unix passwords could be disabled but not re-enabled fixed problem with eval() in status.inc (894433) @@ -1043,7 +1043,7 @@ March 2020 7.1 - better error handling at login - support spaces in DNs - PDF text for users - - create missing OUs recursivly + - create missing OUs recursively - fixed bugs: SMD5 passwords were wrong primaryGroupSID wrong if SID has no relation to Algorithmic RID Base diff --git a/lam/docs/devel/account_pages.htm b/lam/docs/devel/account_pages.htm index c7506423..12b8f5e7 100644 --- a/lam/docs/devel/account_pages.htm +++ b/lam/docs/devel/account_pages.htm @@ -25,7 +25,7 @@ calles the continue_main() function of the accountContainer object which prints all HTML output.

-Managing of user input etc. is completly made by the accountContainer.

diff --git a/lam/docs/devel/type_list.htm b/lam/docs/devel/type_list.htm index e3a861f0..ef6245ea 100644 --- a/lam/docs/devel/type_list.htm +++ b/lam/docs/devel/type_list.htm @@ -115,7 +115,7 @@ If you want to change more than just the labels, take a look at lib/types/user.inc. When a list is displayed then the showPage() function is called. You can overwrite this function to display a -completly new list or just one of the other functions.
+completely new list or just one of the other functions.

diff --git a/lam/help/help.inc b/lam/help/help.inc index 7f9692aa..0ab2356a 100644 --- a/lam/help/help.inc +++ b/lam/help/help.inc @@ -154,7 +154,7 @@ $helpArray = array ( "238" => array ("Headline" => _("Session timeout"), "Text" => _("This is the time (in minutes) of inactivity after which a user is automatically logged off.")), "239" => array ("Headline" => _("Log level"), - "Text" => _("Please select your prefered log level. Messages with a lower level will not be logged.")), + "Text" => _("Please select your preferred log level. Messages with a lower level will not be logged.")), "240" => array ("Headline" => _("Log destination"), "Text" => _("Here you can select where LAM should save its log messages. System logging will go to Syslog on Unix systems and event log on Windows. You can also select an extra file.")), "241" => array ("Headline" => _("Allowed hosts"), diff --git a/lam/lib/3rdParty/composer/pear-pear.horde.org/Horde_Mail/Horde/Mail/Transport.php b/lam/lib/3rdParty/composer/pear-pear.horde.org/Horde_Mail/Horde/Mail/Transport.php index 3481229d..4b6f2212 100644 --- a/lam/lib/3rdParty/composer/pear-pear.horde.org/Horde_Mail/Horde/Mail/Transport.php +++ b/lam/lib/3rdParty/composer/pear-pear.horde.org/Horde_Mail/Horde/Mail/Transport.php @@ -80,7 +80,7 @@ abstract class Horde_Mail_Transport /** * Send a message. * - * @param mixed $recipients Either a comma-seperated list of recipients + * @param mixed $recipients Either a comma-separated list of recipients * (RFC822 compliant), or an array of * recipients, each RFC822 valid. This may * contain recipients not specified in the diff --git a/lam/lib/3rdParty/tcpdf/include/barcodes/qrcode.php b/lam/lib/3rdParty/tcpdf/include/barcodes/qrcode.php index 7ef2759f..8693c9e5 100644 --- a/lam/lib/3rdParty/tcpdf/include/barcodes/qrcode.php +++ b/lam/lib/3rdParty/tcpdf/include/barcodes/qrcode.php @@ -1686,7 +1686,7 @@ class QRcode { /** * Append data to an input object. * The data is copied and appended to the input object. - * @param $items (arrray) input items + * @param $items (array) input items * @param $mode (int) encoding mode. * @param $size (int) size of data (byte). * @param $data (array) array of input data. diff --git a/lam/lib/account.inc b/lam/lib/account.inc index a8fca122..f9e49692 100644 --- a/lam/lib/account.inc +++ b/lam/lib/account.inc @@ -216,7 +216,7 @@ function getSupportedHashTypes() { } /** -* Calculates a password salt of the given legth. +* Calculates a password salt of the given length. * * @param int $len salt length * @return String the salt string @@ -356,11 +356,12 @@ function generateRandomPassword($length = 12) { } /** - * Checks if the given password mathes the crypto hash. + * Checks if the given password matches the crypto hash. * * @param String type hash type (must be one of getSupportedHashTypes()) - * @param unknown_type $hash password hash value - * @param unknown_type $password plain text password to check + * @param string $hash password hash value + * @param string $password plain text password to check + * @return bool hash matches * @see getSupportedHashTypes() */ function checkPasswordHash($type, $hash, $password) { @@ -1115,7 +1116,7 @@ function compareDN(&$a, &$b) { * Formats an LDAP time string (e.g. from createTimestamp). * * @param String $time LDAP time value - * @return String formated time + * @return String formatted time */ function formatLDAPTimestamp($time) { $dateTime = parseLDAPTimestamp($time); @@ -1577,7 +1578,7 @@ function getFormattedTime($format) { * E.g. 70 seconds will return 1m10s. * * @param int $numSeconds number of seconds - * @return String formated number + * @return String formatted number */ function formatSecondsToShortFormat($numSeconds) { if (empty($numSeconds)) { diff --git a/lam/lib/baseModule.inc b/lam/lib/baseModule.inc index c7edaa0f..5ca2ff12 100644 --- a/lam/lib/baseModule.inc +++ b/lam/lib/baseModule.inc @@ -566,7 +566,7 @@ abstract class baseModule { switch ($check['type']) { // check by regular expression (from account.inc) case "ext_preg": - // ignore empty fileds + // ignore empty fields if (!empty($options[$identifier][0]) && !get_preg($options[$identifier][0], $check['regex'])) { $errors[] = $check['error_message']; @@ -574,7 +574,7 @@ abstract class baseModule { break; // check by regular expression (case insensitive) case 'regex_i': - // ignore empty fileds + // ignore empty fields if (!empty($options[$identifier][0]) && !preg_match('/' . $check['regex'] . '/i', $options[$identifier][0])) { $errors[] = $check['error_message']; @@ -582,7 +582,7 @@ abstract class baseModule { break; // check by regular expression (case sensitive) case 'regex': - // ignore empty fileds + // ignore empty fields if (!empty($options[$identifier][0]) && !preg_match('/' . $check['regex'] . '/', $options[$identifier][0])) { $errors[] = $check['error_message']; @@ -715,7 +715,7 @@ abstract class baseModule { switch ($this->meta['config_checks'][$scopes[$s]][$identifiers[$i]]['type']) { // check by regular expression (from account.inc) case "ext_preg": - // ignore empty fileds + // ignore empty fields if ($options[$identifiers[$i]][0] == '') { break; } @@ -725,7 +725,7 @@ abstract class baseModule { break; // check by regular expression (case insensitive) case "regex_i": - // ignore empty fileds + // ignore empty fields if ($options[$identifiers[$i]][0] == '') { break; } @@ -735,7 +735,7 @@ abstract class baseModule { break; // check by regular expression (case sensitive) case "regex": - // ignore empty fileds + // ignore empty fields if ($options[$identifiers[$i]][0] == '') { break; } @@ -1022,9 +1022,9 @@ abstract class baseModule { * The result is an hashtable with the following keys:
*