/**
- * Returns the prefered position of this tool on the tools page.
+ * Returns the preferred position of this tool on the tools page.
* The position may be between 0 and 1000. 0 is the top position.
*
- * @return int prefered position
+ * @return int preferred position
*/
function getPosition() {
return 100;
diff --git a/lam/docs/devel/toolsHowTo.htm b/lam/docs/devel/toolsHowTo.htm
index ea686eb4..6a57953d 100644
--- a/lam/docs/devel/toolsHowTo.htm
+++ b/lam/docs/devel/toolsHowTo.htm
@@ -91,10 +91,10 @@ Example:
}
/**
- * Returns the prefered position of this tool on the tools page.
+ * Returns the preferred position of this tool on the tools page.
* The position may be between 0 and 1000. 0 is the top position.
*
- * @return int prefered position
+ * @return int preferred position
*/
function getPosition() {
return 600;
diff --git a/lam/help/help.inc b/lam/help/help.inc
index 0ab2356a..f7fbf00d 100644
--- a/lam/help/help.inc
+++ b/lam/help/help.inc
@@ -5,7 +5,7 @@ use \LAM\TYPES\TypeManager;
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2003 - 2006 Michael Duergner
- 2003 - 2019 Roland Gruber
+ 2003 - 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
@@ -73,7 +73,7 @@ $helpArray = array (
":
" .
_("When using ldaps:// or TLS be sure to use exactly the same IP/domain name as in your certificate!")),
"202" => array ("Headline" => _("LDAP suffix"),
- "Text" => _("This is the suffix of the LDAP tree from where to search for LDAP entries. Only entries in this subtree will be displayed in the account list. When creating a new accont this will be the DN where it is saved.") .
+ "Text" => _("This is the suffix of the LDAP tree from where to search for LDAP entries. Only entries in this subtree will be displayed in the account list. When creating a new account this will be the DN where it is saved.") .
"
".
_("Example").
":
".
@@ -369,7 +369,7 @@ $helpArray = array (
"751" => array ("Headline" => _('Base DN'),
"Text" => _('The export will read entries of this DN.')),
"752" => array ("Headline" => _('Search filter'),
- "Text" => _('Please enter an LDAP filter to specifiy the exported entries.')),
+ "Text" => _('Please enter an LDAP filter to specify the exported entries.')),
"753" => array ("Headline" => _('Attributes'),
"Text" => _('Please enter a comma separated list of attributes to export. Using "*" will export all attributes.')),
"754" => array ("Headline" => _('Include system attributes'),
diff --git a/lam/lib/modules/asteriskExtension.inc b/lam/lib/modules/asteriskExtension.inc
index 7eaba2b8..fb5130ef 100644
--- a/lam/lib/modules/asteriskExtension.inc
+++ b/lam/lib/modules/asteriskExtension.inc
@@ -6,7 +6,7 @@ use \LAM\PDF\PDFTableRow;
This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam)
Copyright (C) 2009 - 2012 Pavel Pozdniak
- 2009 - 2019 Roland Gruber
+ 2009 - 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
@@ -299,7 +299,7 @@ class asteriskExtension extends baseModule {
//LOAD context from already entities that already exists
$accountContext = $entries[0]['astcontext'][0];
} elseif (isset($this->attributes['AstContext'][0])) {
- //LOAD context from attributes, this is treak to deal with profile
+ //LOAD context from attributes, this is to deal with profile
$accountContext = $this->attributes['AstContext'][0];
}
$accountContextInput = new htmlResponsiveInputField(_("Account context"), 'AstContext', $accountContext, 'AstContext');
@@ -372,7 +372,7 @@ class asteriskExtension extends baseModule {
$applicationData = $extensLine['astapplicationdata'][0];
}
$renderContainer->add(new htmlResponsiveInputField(_("Application data"), "AstApplicationData_" . $placeInList, $applicationData, 'AstApplicationData'), 12);
- //delimeter
+ //delimiter
$renderContainer->addVerticalSpacer('0.5rem');
}
@@ -644,7 +644,7 @@ class asteriskExtension extends baseModule {
/**
* Fills the fields of a single extension row.
- * In Asterisk it would only be an extension name,a priority,an application, but LDAP spicific
+ * In Asterisk it would only be an extension name,a priority,an application, but LDAP specific
* add to processing context field.
*
* @param array $extRow - hash array to store single extension properties;
@@ -680,7 +680,7 @@ class asteriskExtension extends baseModule {
$extRow['astapplicationdata'][0] = $_POST['AstApplicationData_' . $entryCounter];
}
- //Fille the member filed
+ //Fill the member filed
$extRow['member'] = $this->extensionOwners;
if ((!isset($extRow['member']) || count($extRow['member']) == 0)
&& !isset($_POST['form_subpage_' . get_class($this) . '_user_open'])) {
@@ -706,7 +706,7 @@ class asteriskExtension extends baseModule {
}
/**
- * Search by extension name and retun true if fields with this extension name exists
+ * Search by extension name and return true if fields with this extension name exists
* and false otherwise.
* Equal extension names are allowed in different OUs.
*
@@ -817,7 +817,7 @@ class asteriskExtension extends baseModule {
*/
function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$messages = array();
- //hash to strore extension_name => priority. For new extensoin priority will be 1
+ //hash to store extension_name => priority. For new extension priority will be 1
$extensionNamePriorityMap = array();
for ($i = 0; $i < sizeof($rawAccounts); $i++) {
// add object class
diff --git a/lam/lib/modules/fixed_ip.inc b/lam/lib/modules/fixed_ip.inc
index 11913da4..e534f4e4 100644
--- a/lam/lib/modules/fixed_ip.inc
+++ b/lam/lib/modules/fixed_ip.inc
@@ -173,7 +173,7 @@ class fixed_ip extends baseModule {
/**
*
* Check, if a mac address is invalid
- * @param mac adress
+ * @param mac address
*
* @return true, if mac is invalid
**/
diff --git a/lam/lib/modules/inetOrgPerson.inc b/lam/lib/modules/inetOrgPerson.inc
index 86448642..ec89bd4d 100644
--- a/lam/lib/modules/inetOrgPerson.inc
+++ b/lam/lib/modules/inetOrgPerson.inc
@@ -24,7 +24,7 @@ use LAM\PDF\PDFImage;
*/
/**
-* Manages the atrributes of object class inetOrgPerson.
+* Manages the attributes of object class inetOrgPerson.
*
* @package modules
* @author Tilo Lutz
diff --git a/lam/lib/modules/posixAccount.inc b/lam/lib/modules/posixAccount.inc
index 570f7ec6..aed6bb9f 100644
--- a/lam/lib/modules/posixAccount.inc
+++ b/lam/lib/modules/posixAccount.inc
@@ -3670,7 +3670,7 @@ class posixAccount extends baseModule implements passwordService {
/**
* Returns a suggestion for the user name.
- * By deafult this wil be the first character of the first name plus the last name.
+ * By default this wil be the first character of the first name plus the last name.
*
* @param array $attrs LDAP attributes
* @param string $typeId type id (e.g. user)
diff --git a/lam/templates/delete.php b/lam/templates/delete.php
index 72ee16cf..da520d73 100644
--- a/lam/templates/delete.php
+++ b/lam/templates/delete.php
@@ -351,7 +351,7 @@ if (isset($_POST['delete'])) {
* Returns the number of child entries of a DN.
*
* @param string $dn DN of parent
-* @return integer number of childs
+* @return integer number of children
*/
function getChildCount($dn) {
$entries = searchLDAP(escapeDN($dn), 'objectClass=*', array('dn'));
diff --git a/lam/templates/login.php b/lam/templates/login.php
index 6555f94c..4ff31b6e 100644
--- a/lam/templates/login.php
+++ b/lam/templates/login.php
@@ -106,7 +106,7 @@ if(isset($_COOKIE["lam_default_profile"]) && in_array($_COOKIE["lam_default_prof
// Reload loginpage after a profile change
if(isset($_GET['useProfile']) && in_array($_GET['useProfile'], $profiles)) {
logNewMessage(LOG_DEBUG, "Change server profile to " . $_GET['useProfile']);
- $_SESSION['config'] = new LAMConfig($_GET['useProfile']); // Recreate the config object with the submited
+ $_SESSION['config'] = new LAMConfig($_GET['useProfile']); // Recreate the config object with the submitted
}
// Load login page
elseif (!empty($default_Profile) && in_array($default_Profile, $profiles)) {
@@ -556,7 +556,7 @@ if(isset($_POST['checklogin'])) {
$searchLDAP->close();
}
// try to connect to LDAP
- $result = $_SESSION['ldap']->connect($username, $password); // Connect to LDAP server for verifing username/password
+ $result = $_SESSION['ldap']->connect($username, $password); // Connect to LDAP server for verifying username/password
if($result === 0) {// Username/password correct. Do some configuration and load main frame.
$_SESSION['loggedIn'] = true;
// set security settings for session
diff --git a/lam/templates/tests/lamdaemonTest.php b/lam/templates/tests/lamdaemonTest.php
index 63f61359..9cc15d5b 100644
--- a/lam/templates/tests/lamdaemonTest.php
+++ b/lam/templates/tests/lamdaemonTest.php
@@ -15,7 +15,7 @@ use \htmlResponsiveRow;
/*
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
- Copyright (C) 2006 - 2019 Roland Gruber
+ Copyright (C) 2006 - 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
@@ -125,7 +125,7 @@ include '../../lib/adminFooter.inc';
* @param Remote $remote SSH connection
* @param string $testText describing text
* @param htmlResponsiveRow $container container for HTML output
- * @return boolean true, if errors occured
+ * @return boolean true, if errors occurred
*/
function testRemoteCommand($command, $stopTest, $remote, $testText, $container) {
$okImage = "../../graphics/pass.png";
diff --git a/lam/templates/tools/multiEdit.php b/lam/templates/tools/multiEdit.php
index 47e27d20..2c19b06f 100644
--- a/lam/templates/tools/multiEdit.php
+++ b/lam/templates/tools/multiEdit.php
@@ -22,7 +22,7 @@ use \htmlResponsiveTable;
/*
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
- Copyright (C) 2013 - 2019 Roland Gruber
+ Copyright (C) 2013 - 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
@@ -498,11 +498,11 @@ function dryRun() {
*/
function multiEditLdapErrorHandler($errno, $errstr, $errfile, $errline) {
if ($errno === E_USER_ERROR) {
- logNewMessage(LOG_ERR, 'Error occured: ' . $errstr . " ($errfile: $errline)");
+ logNewMessage(LOG_ERR, 'Error occurred: ' . $errstr . " ($errfile: $errline)");
$_REQUEST['multiEdit_error'] = true;
}
elseif ($errno === E_USER_WARNING) {
- logNewMessage(LOG_WARNING, 'Error occured: ' . $errstr . " ($errfile: $errline)");
+ logNewMessage(LOG_WARNING, 'Error occurred: ' . $errstr . " ($errfile: $errline)");
$_REQUEST['multiEdit_error'] = true;
}
}