From 223319836ada62b43e29e97cd259d0a5783ce632 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Mon, 21 Dec 2020 17:05:53 +0100 Subject: [PATCH] typos --- lam-packaging/autoconf/configure.ac | 2 +- lam/HISTORY | 2 +- lam/config/addressbook.conf.sample | 2 +- lam/config/language | 2 +- lam/config/samba3.conf.sample | 2 +- lam/config/unix.conf.sample | 2 +- lam/config/windows_samba4.conf.sample | 2 +- lam/docs/devel/mod_accountPages.htm | 2 +- lam/docs/devel/upload.htm | 2 +- lam/lib/account.inc | 6 ++--- lam/lib/baseModule.inc | 4 +-- lam/lib/modules.inc | 26 +++++++++---------- lam/lib/modules/asteriskExtension.inc | 2 +- lam/lib/modules/inetOrgPerson.inc | 10 +++---- lam/lib/modules/ldapPublicKey.inc | 10 +++---- lam/lib/modules/quota.inc | 2 +- lam/lib/modules/range.inc | 22 ++++++++-------- lam/lib/modules/windowsGroup.inc | 2 +- lam/lib/modules/yubiKeyUser.inc | 10 +++---- .../3rdParty/pla/lib/ds_ldap_pla.php | 2 +- lam/templates/config/confImportExport.php | 2 +- lam/templates/config/confmain.php | 2 +- lam/templates/lib/500_lam.js | 6 ++--- 23 files changed, 62 insertions(+), 62 deletions(-) diff --git a/lam-packaging/autoconf/configure.ac b/lam-packaging/autoconf/configure.ac index 635a15ac8..457b6b23c 100644 --- a/lam-packaging/autoconf/configure.ac +++ b/lam-packaging/autoconf/configure.ac @@ -47,7 +47,7 @@ AC_PATH_PROG(MKDIR, mkdir) AC_PATH_PROG(RM, rm) AC_PATH_PROG(TAR, tar) -# Find a sutable copy command +# Find a suitable copy command AC_PATH_PROG(COPY, copy) AC_PATH_PROG(CP, cp) if test x$COPY = x ; then diff --git a/lam/HISTORY b/lam/HISTORY index 06d3aa8f5..28fbbef49 100644 --- a/lam/HISTORY +++ b/lam/HISTORY @@ -1071,7 +1071,7 @@ March 2021 7.5 - new login layout - added Hungarian and Japanese translations - fixed bugs: - Samba paswords were sometimes empty for new users (892272) + Samba passwords were sometimes empty for new users (892272) links in list views may not work with web servers other than Apache diff --git a/lam/config/addressbook.conf.sample b/lam/config/addressbook.conf.sample index b323b1b4b..8af4c09c9 100644 --- a/lam/config/addressbook.conf.sample +++ b/lam/config/addressbook.conf.sample @@ -8,7 +8,7 @@ ServerURL: ldap://localhost:389 # list of users who are allowed to use LDAP Account Manager -# names have to be seperated by semicolons +# names have to be separated by semicolons # e.g. admins: cn=admin,dc=yourdomain,dc=org;cn=root,dc=yourdomain,dc=org Admins: cn=Manager,dc=my-domain,dc=com diff --git a/lam/config/language b/lam/config/language index e64d5d5a0..b1b28b308 100644 --- a/lam/config/language +++ b/lam/config/language @@ -2,7 +2,7 @@ # # Do not modify! -# Each line consists of a ":"-seperated entry. The first part is the locale name, +# Each line consists of a ":"-separated entry. The first part is the locale name, # the second is the character encoding and the third the language name. # Catalan diff --git a/lam/config/samba3.conf.sample b/lam/config/samba3.conf.sample index b1bba0a0f..d001b0c21 100644 --- a/lam/config/samba3.conf.sample +++ b/lam/config/samba3.conf.sample @@ -8,7 +8,7 @@ ServerURL: ldap://localhost:389 # list of users who are allowed to use LDAP Account Manager -# names have to be seperated by semicolons +# names have to be separated by semicolons # e.g. admins: cn=admin,dc=yourdomain,dc=org;cn=root,dc=yourdomain,dc=org Admins: cn=Manager,dc=my-domain,dc=com diff --git a/lam/config/unix.conf.sample b/lam/config/unix.conf.sample index 1b79910e8..5e66a5e2e 100644 --- a/lam/config/unix.conf.sample +++ b/lam/config/unix.conf.sample @@ -8,7 +8,7 @@ ServerURL: ldap://localhost:389 # list of users who are allowed to use LDAP Account Manager -# names have to be seperated by semicolons +# names have to be separated by semicolons # e.g. admins: cn=admin,dc=yourdomain,dc=org;cn=root,dc=yourdomain,dc=org Admins: cn=Manager,dc=my-domain,dc=com diff --git a/lam/config/windows_samba4.conf.sample b/lam/config/windows_samba4.conf.sample index 348323c5a..5b384b6fb 100644 --- a/lam/config/windows_samba4.conf.sample +++ b/lam/config/windows_samba4.conf.sample @@ -8,7 +8,7 @@ ServerURL: ldap://pdc.my-domain.com # list of users who are allowed to use LDAP Account Manager -# names have to be seperated by semicolons +# names have to be separated by semicolons # e.g. admins: cn=admin,dc=yourdomain,dc=org;cn=root,dc=yourdomain,dc=org Admins: cn=Administrator,cn=users,dc=my-domain,dc=com diff --git a/lam/docs/devel/mod_accountPages.htm b/lam/docs/devel/mod_accountPages.htm index 88fd48a3a..b693d329d 100644 --- a/lam/docs/devel/mod_accountPages.htm +++ b/lam/docs/devel/mod_accountPages.htm @@ -318,7 +318,7 @@ return false;
In most cases you will not have to implement this option if you use $this->attributes and $this->orig to manage the LDAP attributes. The baseModule -will generate the save comands for you.
+will generate the save commands for you.

When all modules report that they are ready for LDAP add/modify and the user clicks on the add/modify button your module will be asked what diff --git a/lam/docs/devel/upload.htm b/lam/docs/devel/upload.htm index 95be92be6..eab0c7f08 100644 --- a/lam/docs/devel/upload.htm +++ b/lam/docs/devel/upload.htm @@ -82,7 +82,7 @@ This script finally uploads the LDAP accounts with ldap_add().

The upload can last longer than the maximum execution time of PHP. -Therefore the script will check regulary how much time is left and +Therefore the script will check regularly how much time is left and pause the upload. This is resumed with a meta refresh which loads the script again.

diff --git a/lam/lib/account.inc b/lam/lib/account.inc index 30736e87c..ad9bba6b4 100644 --- a/lam/lib/account.inc +++ b/lam/lib/account.inc @@ -802,7 +802,7 @@ function searchLDAPByAttribute($name, $value, $objectClass, $attributes, $scopes $entries = searchLDAPPaged($_SESSION['ldap']->server(), escapeDN($type->getSuffix()), $filter, $attributes, 0, $_SESSION['config']->get_searchLimit()); if (ldap_errno($_SESSION['ldap']->server()) == 4) { - logNewMessage(LOG_WARNING, 'LDAP size limit exeeded. Please increase the limit on your server.'); + logNewMessage(LOG_WARNING, 'LDAP size limit exceeded. Please increase the limit on your server.'); } $return = array_merge($return, $entries); } @@ -841,7 +841,7 @@ function searchLDAPByFilter($filter, $attributes, $scopes, $attrsOnly = false) { $entries = searchLDAPPaged($_SESSION['ldap']->server(), escapeDN($type->getSuffix()), $filter, $attributes, $readAttributesOnly, $_SESSION['config']->get_searchLimit()); if (ldap_errno($_SESSION['ldap']->server()) == 4) { - logNewMessage(LOG_WARNING, 'LDAP size limit exeeded. Please increase the limit on your server.'); + logNewMessage(LOG_WARNING, 'LDAP size limit exceeded. Please increase the limit on your server.'); } $return = array_merge($return, $entries); } @@ -864,7 +864,7 @@ function searchLDAP($suffix, $filter, $attributes) { $return = searchLDAPPaged(getLDAPServerHandle(), escapeDN($suffix), $filter, $attributes, 0, $limit); if (ldap_errno(getLDAPServerHandle()) == 4) { - logNewMessage(LOG_WARNING, 'LDAP size limit exeeded. Please increase the limit on your server.'); + logNewMessage(LOG_WARNING, 'LDAP size limit exceeded. Please increase the limit on your server.'); } return $return; } diff --git a/lam/lib/baseModule.inc b/lam/lib/baseModule.inc index 78ba34ddf..1c2db7216 100644 --- a/lam/lib/baseModule.inc +++ b/lam/lib/baseModule.inc @@ -1160,7 +1160,7 @@ abstract class baseModule { *
"notchanged" are attributes which stay unchanged *
"info" values with informational value (e.g. to be used later by pre/postModify actions) *
- *
This builds the required comands from $this-attributes and $this->orig. + *
This builds the required commands from $this-attributes and $this->orig. * * @return array list of modifications */ @@ -1606,7 +1606,7 @@ abstract class baseModule { * * * @param htmlResponsiveRow $container row - * @param string $labelFirst label of first selct + * @param string $labelFirst label of first select * @param string $labelSecond label of second select * @param string[] $optionsFirst options of first select ('label' => 'value') * @param string[] $selectedFirst selected options of first select diff --git a/lam/lib/modules.inc b/lam/lib/modules.inc index b690c1a8d..2227ed6c0 100644 --- a/lam/lib/modules.inc +++ b/lam/lib/modules.inc @@ -866,7 +866,7 @@ class accountContainer { $oldPage = $this->current_page; $oldSubpage = $this->subpage; $result = array(); - $errorsOccured = false; + $errorsOccurred = false; $typeObject = $this->type->getBaseType(); $profileLoaded = $this->loadProfileIfRequested(); if ($this->subpage == '') { @@ -924,7 +924,7 @@ class accountContainer { if (is_array($result)) { // messages were returned, check for errors for ($i = 0; $i < sizeof($result); $i++) { if ($result[$i][0] == 'ERROR') { - $errorsOccured = true; + $errorsOccurred = true; break; } } @@ -934,7 +934,7 @@ class accountContainer { // run type post actions $typeObject->runEditPagePostAction($this); // save account - if (!$errorsOccured && isset($_POST['accountContainerSaveAccount'])) { + if (!$errorsOccurred && isset($_POST['accountContainerSaveAccount'])) { // check if all modules are complete $modules = array_keys($this->module); $incompleteModules = array(); @@ -970,12 +970,12 @@ class accountContainer { if (is_array($result)) { // messages were returned, check for errors for ($i = 0; $i < sizeof($result); $i++) { if ($result[$i][0] == 'ERROR') { - $errorsOccured = true; + $errorsOccurred = true; break; } } } - if (!$errorsOccured) { + if (!$errorsOccurred) { // go to subpage of current module $postKeys = array_keys($_POST); for ($p = 0; $p < sizeof($postKeys); $p++) { @@ -1011,7 +1011,7 @@ class accountContainer { $this->titleBarSubtitle = $typeObject->getTitleBarSubtitle($this); // prints a module content page $this->printModuleContent($result); - if (!$errorsOccured && ($oldPage == $this->current_page) && ($oldSubpage == $this->subpage) + if (!$errorsOccurred && ($oldPage == $this->current_page) && ($oldSubpage == $this->subpage) && isset($_POST['scrollPositionTop']) && isset($_POST['scrollPositionLeft'])) { // scroll to last position echo '