typos

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

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
 
 

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
 

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

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
 

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
 

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
 

lam/docs/devel/mod_accountPages.htm

@@ -318,7 +318,7 @@ return false;<br>
 </h2>
 In most cases you will not have to implement this option if you use <span style="font-weight: bold;">$this-&gt;attributes</span> and <span style="font-weight: bold;">$this-&gt;orig</span> to manage the LDAP
 attributes. The <span style="font-style: italic;">baseModule</span>
-will generate the save comands for you.<br>
+will generate the save commands for you.<br>
 <br>
 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

lam/docs/devel/upload.htm

@@ -82,7 +82,7 @@ This script finally uploads the LDAP accounts with <span
  style="font-style: italic;">ldap_add()</span>.<br>
 <br>
 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.<br>
 <br>

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

lam/lib/baseModule.inc

@@ -1160,7 +1160,7 @@ abstract class baseModule {
 	* <br><b>"notchanged"</b> are attributes which stay unchanged
 	* <br><b>"info"</b> values with informational value (e.g. to be used later by pre/postModify actions)
 	* <br>
-	* <br>This builds the required comands from $this-attributes and $this->orig.
+	* <br>This builds the required commands from $this-attributes and $this->orig.
 	*
 	* @return array list of modifications
 	*/
@@ -1606,7 +1606,7 @@ abstract class baseModule {
 	 * </ul>
 	 *
 	 * @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

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 '<script type="text/javascript">
@@ -1200,7 +1200,7 @@ class accountContainer {
 		}
 		$return = array(
 			'messages' => '',
-			'errorsOccured' => 'false'
+			'errorsOccurred' => 'false'
 		);
 		if ($random == 'true') {
 			$password1 = generateRandomPassword();
@@ -1210,13 +1210,13 @@ class accountContainer {
 			// check if passwords match
 			if ($password1 != $password2) {
 				$return['messages'] .= StatusMessage('ERROR', _('Passwords are different!'), '', array(), true);
-				$return['errorsOccured'] = 'true';
+				$return['errorsOccurred'] = 'true';
 			}
 			// check passsword strength
 			$pwdPolicyResult = checkPasswordStrength($password1, null, null);
 			if ($pwdPolicyResult !== true) {
 				$return['messages'] .= StatusMessage('ERROR', $pwdPolicyResult, '', array(), true);
-				$return['errorsOccured'] = 'true';
+				$return['errorsOccurred'] = 'true';
 			}
 		}
 		$forcePasswordChange = false;
@@ -1228,14 +1228,14 @@ class accountContainer {
 			$sendMail = true;
 		}
 		$return['forcePasswordChange'] = $forcePasswordChange;
-		if ($return['errorsOccured'] == 'false') {
+		if ($return['errorsOccurred'] == 'false') {
 			// set new password
 			foreach ($this->module as $module) {
 				if ($module instanceof passwordService) {
 					$messages = $module->passwordChangeRequested($password1, $modules, $forcePasswordChange);
 					for ($m = 0; $m < sizeof($messages); $m++) {
 						if ($messages[$m][0] == 'ERROR') {
-							$return['errorsOccured'] = 'true';
+							$return['errorsOccurred'] = 'true';
 						}
 						if (sizeof($messages[$m]) == 2) {
 							$return['messages'] .= StatusMessage($messages[$m][0], $messages[$m][1], '', array(), true);
@@ -1255,12 +1255,12 @@ class accountContainer {
 			if (($_SESSION['config']->getLamProMailAllowAlternateAddress() != 'false') && !empty($input['sendMailAlternateAddress'])) {
 				if (!get_preg($input['sendMailAlternateAddress'], 'email')) {
 					$return['messages'] .= StatusMessage('ERROR', _('Alternate recipient'), _('Please enter a valid email address!'), array(), true);
-					$return['errorsOccured'] = 'true';
+					$return['errorsOccurred'] = 'true';
 				}
 				$this->sendPasswordViaMailAlternateAddress = $input['sendMailAlternateAddress'];
 			}
 		}
-		if ($return['errorsOccured'] == 'false') {
+		if ($return['errorsOccurred'] == 'false') {
 			$return['messages'] .= StatusMessage('INFO', _('The new password will be stored in the directory after you save this account.'), '', array(), true);
 		}
 		return $return;

lam/lib/modules/asteriskExtension.inc

@@ -892,7 +892,7 @@ class asteriskExtension extends baseModule {
 	* <br><b>"notchanged"</b> are attributes which stay unchanged
 	* <br><b>"info"</b> values with informational value (e.g. to be used later by pre/postModify actions)
 	* <br>
-	* <br>This builds the required comands from $this-attributes and $this->orig.
+	* <br>This builds the required commands from $this-attributes and $this->orig.
 	*
 	* @return array list of modifications
 	*/

lam/lib/modules/inetOrgPerson.inc

@@ -3175,7 +3175,7 @@ class inetOrgPerson extends baseModule implements passwordService {
 			}
 
 			function inetOrgPersonDeletePhotoHandleReply(data) {
-				if (data.errorsOccured == "false") {
+				if (data.errorsOccurred == "false") {
 					jQuery(\'#inetOrgPersonPhotoUploadContent\').html(data.html);
 					window.lam.tools.webcam.init();
 				}
@@ -3259,7 +3259,7 @@ class inetOrgPerson extends baseModule implements passwordService {
 			}
 
 			function inetOrgPersonDeleteCertificateHandleReply(data) {
-				if (data.errorsOccured == "false") {
+				if (data.errorsOccurred == "false") {
 					jQuery(\'#userCertificateDiv\').html(data.html);
 				}
 				else {
@@ -3904,7 +3904,7 @@ class inetOrgPerson extends baseModule implements passwordService {
 		$content = ob_get_contents();
 		ob_end_clean();
 		return array(
-			'errorsOccured' => 'false',
+			'errorsOccurred' => 'false',
 			'html' => $content,
 		);
 	}
@@ -3932,7 +3932,7 @@ class inetOrgPerson extends baseModule implements passwordService {
 		$content = ob_get_contents();
 		ob_end_clean();
 		return array(
-			'errorsOccured' => 'false',
+			'errorsOccurred' => 'false',
 			'html' => $content,
 		);
 	}
@@ -3946,7 +3946,7 @@ class inetOrgPerson extends baseModule implements passwordService {
 		if ($message == null) {
 			$message = _('Invalid request');
 		}
-		return array('errorsOccured' => 'true', 'errormessage' => $message);
+		return array('errorsOccurred' => 'true', 'errormessage' => $message);
 	}
 
 	/**

lam/lib/modules/ldapPublicKey.inc

@@ -396,7 +396,7 @@ class ldapPublicKey extends baseModule {
 			}
 
 			function ldapPublicKeyDeleteKeyHandleReply(data) {
-				if (data.errorsOccured == "false") {
+				if (data.errorsOccurred == "false") {
 					jQuery(\'#sshPublicKeyDiv\').html(data.html);
 				}
 				else {
@@ -419,7 +419,7 @@ class ldapPublicKey extends baseModule {
 			}
 
 			function ldapPublicKeyAddKeyHandleReply(data) {
-				if (data.errorsOccured == "false") {
+				if (data.errorsOccurred == "false") {
 					jQuery(\'#sshPublicKeyDiv\').html(data.html);
 				}
 				else {
@@ -559,7 +559,7 @@ class ldapPublicKey extends baseModule {
 				$content = ob_get_contents();
 				ob_end_clean();
 				$jsonReturn = array(
-					'errorsOccured' => 'false',
+					'errorsOccurred' => 'false',
 					'html' => $content,
 				);
 			}
@@ -634,7 +634,7 @@ class ldapPublicKey extends baseModule {
 		$content = ob_get_contents();
 		ob_end_clean();
 		return array(
-			'errorsOccured' => 'false',
+			'errorsOccurred' => 'false',
 			'html' => $content,
 		);
 	}
@@ -648,7 +648,7 @@ class ldapPublicKey extends baseModule {
 		if ($message == null) {
 			$message = _('Invalid request');
 		}
-		return array('errorsOccured' => 'true', 'errormessage' => $message);
+		return array('errorsOccurred' => 'true', 'errormessage' => $message);
 	}
 
 }

lam/lib/modules/quota.inc

@@ -1048,7 +1048,7 @@ class quota extends baseModule {
 	* <br><b>"notchanged"</b> are attributes which stay unchanged
 	* <br><b>"info"</b> values with informational value (e.g. to be used later by pre/postModify actions)
 	* <br>
-	* <br>This builds the required comands from $this-attributes and $this->orig.
+	* <br>This builds the required commands from $this-attributes and $this->orig.
 	*
 	* @return array list of modifications
 	*/

lam/lib/modules/range.inc

@@ -316,7 +316,7 @@ class range extends baseModule {
 		}
 		$subnet = $this->getAccountContainer()->getAccountModule('dhcp_settings')->attributes['cn'][0];
 		$mask = $this->getAccountContainer()->getAccountModule('dhcp_settings')->getDHCPOption('subnet-mask');
-	    $errorOccured = false;
+	    $errorOccurred = false;
 	    $this->reset_overlapped_range();
 		if ($this->getAccountContainer()->getAccountModule('dhcp_settings')->attributes['cn'][0]!="") {
 
@@ -337,39 +337,39 @@ class range extends baseModule {
 					// Check range_start:
 					$_POST['range_start_'.$id] = trim($_POST['range_start_'.$id]);
 			        if (!check_ip($_POST['range_start_'.$id])) {
-			        	$errorOccured = true;
+			        	$errorOccurred = true;
 			        }
 		            $this->ranges[$id]['range_start'] = $_POST['range_start_'.$id];
 
 					// Check end:
 					$_POST['range_end_'.$id] = trim($_POST['range_end_'.$id]);
 			        if (!check_ip($_POST['range_end_'.$id])) {
-			        	$errorOccured = true;
+			        	$errorOccurred = true;
 			        }
 		            $this->ranges[$id]['range_end'] = $_POST['range_end_'.$id];
 
 			        // Check if ip overlapped:
 			        if(!$this->isNotOverlappedRange($_POST['range_start_'.$id],$_POST['range_end_'.$id])) {
-			            $errorOccured = true;
+			            $errorOccurred = true;
 			        }
 
 					// Check if Subnet and range first are valid:
 					if (!range::check_subnet_range($_POST['range_start_'.$id], $subnet, $mask)) {
-					    $errorOccured = true;
+					    $errorOccurred = true;
 					}
 
 					// Check if Subnet and range last are valid:
 					if (!range::check_subnet_range($_POST['range_end_'.$id], $subnet, $mask)) {
-					    $errorOccured = true;
+					    $errorOccurred = true;
 					}
 
 			        // Check if Range is valid
 			        if (!$this->check_range($_POST['range_start_'.$id],$_POST['range_end_'.$id])) {
-			            $errorOccured = true;
+			            $errorOccurred = true;
 			        }
 
 			        // Check, if range_start and range_end are ok!
-			        if (!$errorOccured) {
+			        if (!$errorOccurred) {
 			            $this->attributes['dhcpRange'][$id] = $_POST['range_start_'.$id]." ".$_POST['range_end_'.$id];
 			        }
 			        else {
@@ -382,7 +382,7 @@ class range extends baseModule {
 		// Add new Range
 		if(isset($_POST['add_range'])) {
 			// Check, if there where no errors:
-			if ($errorOccured) {
+			if ($errorOccurred) {
 			    $errors[] = $this->messages['add_range'][0];
 			}
 			else
@@ -438,7 +438,7 @@ class range extends baseModule {
 								|| !range::check_subnet_range($from, $subnet, $mask)
 								|| !range::check_subnet_range($to, $subnet, $mask)
 								|| !$this->check_range($from, $to)) {
-							$errorOccured = true;
+							$errorOccurred = true;
 						}
 					}
 				}
@@ -463,7 +463,7 @@ class range extends baseModule {
 		}
 
 		// Check if there was a error:
-		if ($errorOccured) {
+		if ($errorOccurred) {
 		    $errors[] = $this->messages['range_errors'][0];
 		}
 

lam/lib/modules/windowsGroup.inc

@@ -983,7 +983,7 @@ class windowsGroup extends baseModule {
 	* <br><b>"notchanged"</b> are attributes which stay unchanged
 	* <br><b>"info"</b> values with informational value (e.g. to be used later by pre/postModify actions)
 	* <br>
-	* <br>This builds the required comands from $this-attributes and $this->orig.
+	* <br>This builds the required commands from $this-attributes and $this->orig.
 	*
 	* @return array list of modifications
 	*/

lam/lib/modules/yubiKeyUser.inc

@@ -351,7 +351,7 @@ class yubiKeyUser extends baseModule {
 			}
 
 			function yubiKeyIdDeleteKeyHandleReply(data) {
-				if (data.errorsOccured == "false") {
+				if (data.errorsOccurred == "false") {
 					jQuery(\'#yubiKeyIdDiv\').html(data.html);
 				}
 				else {
@@ -374,7 +374,7 @@ class yubiKeyUser extends baseModule {
 			}
 
 			function yubiKeyIdAddKeyHandleReply(data) {
-				if (data.errorsOccured == "false") {
+				if (data.errorsOccurred == "false") {
 					jQuery(\'#yubiKeyIdDiv\').html(data.html);
 				}
 				else {
@@ -484,7 +484,7 @@ class yubiKeyUser extends baseModule {
 				$content = ob_get_contents();
 				ob_end_clean();
 				$jsonReturn = array(
-					'errorsOccured' => 'false',
+					'errorsOccurred' => 'false',
 					'html' => $content,
 				);
 			}
@@ -515,7 +515,7 @@ class yubiKeyUser extends baseModule {
 		$content = ob_get_contents();
 		ob_end_clean();
 		return array(
-			'errorsOccured' => 'false',
+			'errorsOccurred' => 'false',
 			'html' => $content,
 		);
 	}
@@ -529,7 +529,7 @@ class yubiKeyUser extends baseModule {
 		if ($message == null) {
 			$message = _('Invalid request');
 		}
-		return array('errorsOccured' => 'true', 'errormessage' => $message);
+		return array('errorsOccurred' => 'true', 'errormessage' => $message);
 	}
 
 	/**

lam/templates/3rdParty/pla/lib/ds_ldap_pla.php

@@ -586,7 +586,7 @@ class ldap_pla extends myldap {
 	}
 
 	/**
-	 * Check if the session timeout has occured for this LDAP server.
+	 * Check if the session timeout has occurred for this LDAP server.
 	 */
 	public function isSessionValid() {
 		# If inactiveTime() returns a value, we need to check that it has not expired.

lam/templates/config/confImportExport.php

@@ -134,7 +134,7 @@ printHeaderContents(_("Import and export configuration"), '../..');
     /**
      * Shows the login dialog for the configuration master password.
      *
-     * @param htmlStatusMessage $message message to show if any error occured
+     * @param htmlStatusMessage $message message to show if any error occurred
      */
 	function showLoginDialog($message = null) {
     	$tabindex = 0;

lam/templates/config/confmain.php

@@ -423,7 +423,7 @@ $row->add($toolSettingsContent, 12);
 
 $row->addVerticalSpacer('2rem');
 
-// security setings
+// security settings
 $row->add(new htmlSubTitle(_("Security settings"), '../../graphics/security.png', null, true), 12);
 // login method
 $loginOptions = array(

lam/templates/lib/500_lam.js

@@ -285,7 +285,7 @@ function passwordHandleInput(random, ajaxURL, tokenName, tokenValue) {
  * @param data JSON reply
  */
 function passwordHandleReply(data) {
-	if (data.errorsOccured == "false") {
+	if (data.errorsOccurred == "false") {
 		jQuery('#passwordDialogMessageArea').html("");
 		jQuery('#passwordDialog').dialog("close");
 		jQuery('#passwordMessageArea').html(data.messages);
@@ -1400,7 +1400,7 @@ window.lam.dynamicSelect.onScroll = function(selectField, event, maxOptions, num
 /**
  * Loads the next bunch of options at the end.
  *
- * @param selectField selct field
+ * @param selectField select field
  * @param maxOptions maximum options to show
  * @param numberOfOptionsToLoad number of options to add
  */
@@ -1431,7 +1431,7 @@ window.lam.dynamicSelect.loadNextOptions = function(selectField, maxOptions, num
 /**
  * Loads the next bunch of options at the beginning.
  *
- * @param selectField selct field
+ * @param selectField select field
  * @param maxOptions maximum options to show
  * @param numberOfOptionsToLoad number of options to add
  */