From 5b14134108c2e88a38e8722362c180c1f9043680 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Tue, 3 Mar 2020 20:34:06 +0100 Subject: [PATCH] spell checking --- lam/lib/baseModule.inc | 16 ++++++++-------- lam/lib/baseType.inc | 5 ++--- lam/lib/checkEnvironment.inc | 4 ++-- lam/lib/import.inc | 4 ++-- lam/lib/pdfstruct.inc | 4 ++-- lam/lib/security.inc | 2 +- 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/lam/lib/baseModule.inc b/lam/lib/baseModule.inc index e25f0b9b..d6344431 100644 --- a/lam/lib/baseModule.inc +++ b/lam/lib/baseModule.inc @@ -544,7 +544,7 @@ abstract class baseModule { * $options is an hash array (option name => value) that contains the user input. * The option values are all arrays containing one or more elements.
* If the input data is invalid the return value is an array that contains arrays - * to build StatusMessages (message type, message head, message text). If no errors occured + * to build StatusMessages (message type, message head, message text). If no errors occurred * the function returns an empty array. * * @param array $options a hash array (name => value) containing the user input @@ -688,7 +688,7 @@ abstract class baseModule { * Calling this method does not require the existence of an enclosing {@link accountContainer}.
*
* If the input data is invalid the return value is an array that contains subarrays to build StatusMessages ('message type', 'message head', 'message text'). - *
If no errors occured the function returns an empty array. + *
If no errors occurred the function returns an empty array. * * @param array $typeIds list of account type ids which are used * @param array $options hash array (option name => value) that contains the input. The option values are all arrays containing one or more elements. @@ -908,7 +908,7 @@ abstract class baseModule { } /** - * Returns a list of module names which must be processed in building the account befor this module. + * Returns a list of module names which must be processed in building the account before this module. * * Calling this method does not require the existence of an enclosing {@link accountContainer}.
*
@@ -930,7 +930,7 @@ abstract class baseModule { * * Calling this method does not require the existence of an enclosing {@link accountContainer}.
*
- * Returns an array which contains subarrays to generate StatusMessages if any errors occured. + * Returns an array which contains subarrays to generate StatusMessages if any errors occurred. * * @param array $rawAccounts the user input data, contains one subarray for each account. * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5) @@ -2066,7 +2066,7 @@ abstract class baseModule { *
* If the input data is invalid the return value is an array that contains arrays * to build StatusMessages (message type, message head, message text). If no errors - * occured the function returns an empty array. + * occurred the function returns an empty array. * * @param array $options hash array (option name => value) that contains the input. The option values are all arrays containing one or more elements. * @param selfServiceProfile $profile self service profile @@ -2084,7 +2084,7 @@ abstract class baseModule { * * @param boolean $newAccount is new account or existing one * @param array $attributes LDAP attributes of this entry - * @return boolean true, if no problems occured + * @return boolean true, if no problems occurred */ public function preModifySelfService($newAccount, $attributes) { return true; @@ -2095,7 +2095,7 @@ abstract class baseModule { * * @param boolean $newAccount is new account or existing one * @param array $attributes LDAP attributes of this entry - * @return boolean true, if no problems occured + * @return boolean true, if no problems occurred */ public function postModifySelfService($newAccount, $attributes) { return true; @@ -2163,7 +2163,7 @@ abstract class baseModule { /** * Returns the path to the module icon. - * The path must be releative to graphics (e.g. key.png) or an URL (/icons/icon.png or http://server/icon.png). + * The path must be relative to graphics (e.g. key.png) or an URL (/icons/icon.png or http://server/icon.png). * You can also set $this->meta['icon']. The preferred size is 32x32px. * * @return unknown diff --git a/lam/lib/baseType.inc b/lam/lib/baseType.inc index 3258712d..0811da18 100644 --- a/lam/lib/baseType.inc +++ b/lam/lib/baseType.inc @@ -2,10 +2,9 @@ use LAM\TYPES\ConfiguredType; /* -$Id$ This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) - Copyright (C) 2005 - 2017 Roland Gruber + Copyright (C) 2005 - 2020 Roland Gruber This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -177,7 +176,7 @@ class baseType { * Checks input values of config settings. *
* If the input data is invalid the return value is an array that contains subarrays to build StatusMessages ('message type', 'message head', 'message text'). - *
If no errors occured the function returns an empty array. + *
If no errors occurred the function returns an empty array. * * @param array $options hash array (option name => value) that contains the input. The option values are all arrays containing one or more elements. * @return array list of error messages diff --git a/lam/lib/checkEnvironment.inc b/lam/lib/checkEnvironment.inc index 7f38ff8d..4bbb89db 100644 --- a/lam/lib/checkEnvironment.inc +++ b/lam/lib/checkEnvironment.inc @@ -35,7 +35,7 @@ include_once(__DIR__ . "/../lib/status.inc"); /** config */ include_once(__DIR__ . "/../lib/config.inc"); -// check if PHP >= 5.6.0 +// check if PHP >= 7 if (version_compare(phpversion(), '7.0.0') < 0) { echo "\n\n"; echo "\n\n"; @@ -129,7 +129,7 @@ $mainConfig = new LAMCfgMain(); if (!$mainConfig->isConfigFileExisting() && !$mainConfig->installSampleConfig()) { $criticalErrors[] = array("ERROR", "The main config file (config.cfg) does not exist.", "Please see the manual for installation instructions."); } -// stop login if critical errors occured +// stop login if critical errors occurred if (sizeof($criticalErrors) > 0) { echo "\n\n"; echo "\n\n"; diff --git a/lam/lib/import.inc b/lam/lib/import.inc index 2e607cd9..345836dc 100644 --- a/lam/lib/import.inc +++ b/lam/lib/import.inc @@ -5,7 +5,7 @@ use \LAMException; /* This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) - Copyright (C) 2018 - 2019 Roland Gruber + Copyright (C) 2018 - 2020 Roland Gruber This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -421,7 +421,7 @@ interface ImporterTask { /** * Runs the task. * - * @return string HTML output or LAMException if error occured + * @return string HTML output or LAMException if error occurred */ public function run(); diff --git a/lam/lib/pdfstruct.inc b/lam/lib/pdfstruct.inc index ca4d3463..c6b7635d 100644 --- a/lam/lib/pdfstruct.inc +++ b/lam/lib/pdfstruct.inc @@ -7,7 +7,7 @@ use \LAM\ImageUtils\ImageManipulationFactory; /* This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) Copyright (C) 2003 - 2006 Michael Duergner - 2011 - 2018 Roland Gruber + 2011 - 2020 Roland Gruber This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -76,7 +76,7 @@ function getPDFStructures($typeId, $profile = null) { * @param string $typeId account type * @param string $name Name of definition to delete * - * @return boolean True if file was deleted or false if a problem occured. + * @return boolean True if file was deleted or false if a problem occurred. */ function deletePDFStructure($typeId, $name) { if (!isValidPDFStructureName($name) || !preg_match('/[a-zA-Z]+/',$typeId)) { diff --git a/lam/lib/security.inc b/lam/lib/security.inc index d563d0d4..e1fb6cd4 100644 --- a/lam/lib/security.inc +++ b/lam/lib/security.inc @@ -402,7 +402,7 @@ function checkPasswordStrength($password, $userName, $otherUserAttrs) { if (strlen($password) < $cfg->passwordMinLength) { return sprintf(_('The password is too short. You have to enter at least %s characters.'), $cfg->passwordMinLength); } - // get number of characers per character class + // get number of characters per character class $lower = 0; $upper = 0; $numeric = 0;