WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

spell checking

Browse Source
pull/87/head
Roland Gruber 4 years ago
parent 45b4bdb7d5
commit 5b14134108
6 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File

16
lam/lib/baseModule.inc
Unescape Escape View File

@ -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.<br>
* 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}.<br>
* <br>
* If the input data is invalid the return value is an array that contains subarrays to build StatusMessages ('message type', 'message head', 'message text').
* <br>If no errors occured the function returns an empty array.
* <br>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}.<br>
* <br>
@ -930,7 +930,7 @@ abstract class baseModule {
*
* Calling this method does not require the existence of an enclosing {@link accountContainer}.<br>
* <br>
* 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 {
* <br>
* 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

5
lam/lib/baseType.inc
Unescape Escape View File

@ -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.
* <br>
* If the input data is invalid the return value is an array that contains subarrays to build StatusMessages ('message type', 'message head', 'message text').
* <br>If no errors occured the function returns an empty array.
* <br>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

4
lam/lib/checkEnvironment.inc
Unescape Escape View File

@ -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 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n\n";
echo "<html>\n<head>\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 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n\n";
echo "<html>\n<head>\n";

4
lam/lib/import.inc
Unescape Escape View File

@ -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();

4
lam/lib/pdfstruct.inc
Unescape Escape View File

@ -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)) {

2
lam/lib/security.inc
Unescape Escape View File

@ -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;

Write Preview
Loading…
Cancel
Save